Merge branch 'upstream' for new release 2.1
authorJulien Valroff <julien@kirya.net>
Tue, 9 Mar 2010 17:25:23 +0000 (18:25 +0100)
committerJulien Valroff <julien@kirya.net>
Tue, 9 Mar 2010 17:25:23 +0000 (18:25 +0100)
commitfe8f99efda68887e2190fe3e38c1eb67dc565786
tree435bee7751aaf74ab23dfac5668e1828d6731915
parent8d590b9a85407f252298f3c46eca67dcf2d36bb0
parenta0c1a00f73015f470a0ca745e0eea677fff1c438
Merge branch 'upstream' for new release 2.1

Conflicts:
debian/changelog
debian/control
debian/copyright
debian/rules
debian/changelog