Joey Hess 52a48d1a78 Merge branch 'master' into xmpp		2012-10-25 14:43:55 -04:00
..
changelog	Re-enable dbus, using a new version of the library that fixes the memory leak.	2012-10-25 14:32:30 -04:00
compat
control	Merge branch 'master' into xmpp	2012-10-25 14:43:55 -04:00
copyright	move	2012-10-01 13:38:19 -04:00
doc-base
NEWS
rules	added network-protocol-xmpp and -DWITH_XMPP	2012-10-23 20:24:23 -04:00