Joey Hess b12db9ef92 Merge branch 'master' into assistant ... Conflicts: debian/changelog Updated changelog for assistant and webapp		2012-08-27 13:31:54 -04:00
..
changelog	Merge branch 'master' into assistant	2012-08-27 13:31:54 -04:00
compat	debhelper v9	2012-01-15 14:53:38 -04:00
control	add yesod-default	2012-07-27 12:09:34 -04:00
copyright	Merge branch 'master' into assistant	2012-08-20 16:04:56 -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	update	2010-10-27 15:08:46 -04:00