merge changelog
authorJean-Philippe Orsini <jeanfi@gmail.com>
Sat, 21 Jul 2012 10:50:49 +0000 (10:50 +0000)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Sat, 21 Jul 2012 10:50:49 +0000 (10:50 +0000)
commite172b5f2748f8dcb13cad5cc5aba64b29de4ec51
tree99291fc9ffa84693ddf83b5ea15f4a02b15dc08d
parentbc59d32b0f8afe3e2aaa267dad93b19158eb285a
merge changelog
debian/changelog