merge patched-debian into debian
authorSam Hartman <hartmans@debian.org>
Fri, 26 Sep 2014 15:26:38 +0000 (11:26 -0400)
committerSam Hartman <hartmans@debian.org>
Fri, 26 Sep 2014 15:26:38 +0000 (11:26 -0400)
commit59ff526d74ff91667cadf47fbfd13f9772731c41
treecd44964e211380e987e60aa1d7608e495e2eae7f
parente3f68eec81b56cb3cad2cf9b8d61a777132e3010
parent94b3a9a144e60c28e7c1d8a9cefe1b66a6f8091d
merge patched-debian into debian
debian/.git-dpm
debian/patches/series
debian/patches/upstream/0002-Bring-back-portal.cfg-and-manual.cfg.patch