Joey Hess 041c99c175 Merge remote-tracking branch 'origin/master' into xmpp ... Conflicts: doc/design/assistant/cloud.mdwn		2012-10-25 13:04:25 -04:00
..
changelog	configure: Check that checksum programs produce correct checksums. + bitter rant	2012-10-25 00:05:17 -04:00
compat	debhelper v9	2012-01-15 14:53:38 -04:00
control	added network-protocol-xmpp and -DWITH_XMPP	2012-10-23 20:24:23 -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