merge branch 'ubuntu'
authorFrederic Plourde <frederic.plourde@collabora.co.uk>
Fri, 24 Feb 2012 01:24:39 +0000 (20:24 -0500)
committerFrederic Plourde <frederic.plourde@collabora.co.uk>
Fri, 24 Feb 2012 01:24:39 +0000 (20:24 -0500)
commit4a13daf24099387f671bcef1b2a31f7deeb1f4e3
tree2e741009ef2a56161d69ef9567b5dc54444e26f9
parentf8cb616c6090999bb019e3a34c03dc0721d4ba4f
parent175fca60412acb2fde85cef0d5737a51d463b20d
merge branch 'ubuntu'
.pc/applied-patches
debian/changelog
debian/compiz-plugins.install
debian/rules