]> spindle.queued.net Git - midori/commit
Merge branch 'nmu-0.2' master
authorAndres Salomon <dilinger@debian.org>
Sun, 28 Jun 2015 03:52:24 +0000 (20:52 -0700)
committerAndres Salomon <dilinger@debian.org>
Sun, 28 Jun 2015 03:52:24 +0000 (20:52 -0700)
commit597a50019bceeca112f5cdcebdee21b23208a4a2
tree471bfabe03c7e57c621cfa4863531cd571c974c0
parent2d27f4a46f6d6e4f3ab331510498498a3bc1caf8
parentab72120436cea8fa2d93acc693e021525396cb43
Merge branch 'nmu-0.2'

Conflicts:
debian/changelog
debian/rules
debian/changelog
debian/rules