Merge branch 'master' of git.omp.am:/home/omp/git/conky

Conflicts:
	src/conky.c

diff --cc src/conky.c
index da73332,5582ba9..d26cb78
--- 1/src/conky.c
--- 2/src/conky.c
+++ b/src/conky.c
@@@ -7787,9 -7914,9 +7914,12 @@@ void clean_up(void *memtofree1, void* m
        llua_shutdown_hook();
        llua_close();
  #endif /* HAVE_LUA */
 +#ifdef IMLIB2
 +      cimlib_deinit();
 +#endif /* IMLIB2 */
+ #ifdef XOAP
+       xmlCleanupParser();
+ #endif /* XOAP */
  
        if (specials) {
                for (i = 0; i < special_count; i++) {