Joey Hess 2aed2d8510 Merge branch 'master' into bootstrap3 ... Conflicts: debian/changelog		2014-05-02 15:32:49 -03:00
..
tests	Debian: Run the builtin test suite as an autopkgtest.	2013-08-15 15:49:19 +02:00
changelog	Merge branch 'master' into bootstrap3	2014-05-02 15:32:49 -03:00
compat	debhelper v9	2012-01-15 14:53:38 -04:00
control	Avoid depending on shakespeare except for when building the webapp.	2014-04-13 13:12:14 -04:00
copyright	updated license for bootstrap 3	2014-04-29 15:03:18 -04:00
doc-base	Add doc-base file. Closes: #621408	2011-04-06 21:57:22 -04:00
menu	fixups	2013-05-15 22:48:27 -04:00
NEWS	prep release	2013-10-02 16:13:45 -04:00
rules	re-enable test suite	2013-12-30 14:39:29 -04:00