Merge branch 'upstream'
authorLuk Claes <luk@debian.org>
Fri, 25 May 2012 17:13:06 +0000 (19:13 +0200)
committerLuk Claes <luk@debian.org>
Fri, 25 May 2012 17:13:06 +0000 (19:13 +0200)
1  2 
.gitignore

diff --cc .gitignore
Simple merge