Merge branch 'master' into ppa-daily-trunk
authorJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 25 Apr 2014 09:30:41 +0000 (11:30 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 25 Apr 2014 09:30:41 +0000 (11:30 +0200)
commit56d21c57185d4e7c12a9afa191aa3336e73562c7
tree7d4d2af4e3bd715982024771fce5e34f2e017f65
parent8c3be67b8091465754dbfc5f8882b68ee87f10e7
parent383095e38d0fa73b96430aac4e6b17b6627fe077
Merge branch 'master' into ppa-daily-trunk

Conflicts:
debian/changelog
debian/changelog