Merge branch 'upstream'
authorRaphaël Hertzog <hertzog@debian.org>
Fri, 8 Feb 2013 16:28:17 +0000 (17:28 +0100)
committerRaphaël Hertzog <hertzog@debian.org>
Fri, 8 Feb 2013 16:28:17 +0000 (17:28 +0100)
commit9696c8105cee59a24a9b24ee2f226ca4bbf10968
tree060b4bec9657603a8156e57d4424120a3f9a2fd7
parentd68bcf3122464a41f8133925af2111c263a66b4a
parent0e7cb6ccacd998947242a71656f36bfc4e77f246
Merge branch 'upstream'

This merges the deletion of the debian directory in the upstream branch
while not changing anything in the content of the master branch where
we have our own debian dir.