Merge 'ubuntu' branch
authorFrederic Plourde <frederic.plourde@collabora.co.uk>
Sat, 25 Feb 2012 23:42:32 +0000 (18:42 -0500)
committerFrederic Plourde <frederic.plourde@collabora.co.uk>
Sat, 25 Feb 2012 23:42:32 +0000 (18:42 -0500)
commit7a080bbaed6ff0ee76d3962f5816808399d10b9c
treee6b65e54fe938e551062cbf28a96dbbd312c78d2
parent2653407f621f21a3049bd4f724a37d7dcb114432
parentebfb6bb74f0bd0871a8cf17d2ea8e18012e93fa0
Merge 'ubuntu' branch
debian/changelog
debian/control