Merge branch 'master' into master-experimental
authorDidier Raboud <odyx@debian.org>
Sun, 11 Mar 2012 15:50:03 +0000 (16:50 +0100)
committerDidier Raboud <odyx@debian.org>
Sun, 11 Mar 2012 15:50:03 +0000 (16:50 +0100)
commit317434268b5f7da43340de7d041402d27e2de255
tree5bbafa9394269bf8222cf4c543286d546aaa3dc3
parent9c816f9f871bd8a72f023d468787951801e03443
parente5f563c976ad2b5c8d5a09031e37b3e21aa6c27e
Merge branch 'master' into master-experimental
debian/changelog
debian/control