Joey Hess d1e5f2d596 Merge branch 'master' into xmpp ... Conflicts: Assistant/Threads/NetWatcher.hs		2012-10-26 19:42:24 -04:00
..
changelog	NetWatcher: When dbus connection is lost, try to reconnect.	2012-10-26 19:38:27 -04:00
compat	debhelper v9	2012-01-15 14:53:38 -04:00
control	Merge branch 'master' into xmpp	2012-10-26 19:42:24 -04:00
copyright	move	2012-10-01 13:38:19 -04:00
doc-base	Add doc-base file. Closes: #621408	2011-04-06 21:57:22 -04:00
NEWS	releasing version 3.20120123	2012-01-23 15:09:50 -04:00
rules	added network-protocol-xmpp and -DWITH_XMPP	2012-10-23 20:24:23 -04:00