Code

Merged branch 'mf/master'.
authorSebastian Harl <sh@tokkee.org>
Sun, 15 Sep 2013 11:30:18 +0000 (13:30 +0200)
committerSebastian Harl <sh@tokkee.org>
Sun, 15 Sep 2013 11:30:18 +0000 (13:30 +0200)
1  2 
debian/control
debian/rules

diff --cc debian/control
Simple merge
diff --cc debian/rules
Simple merge