Merge branch 'launchpad-trunk'
authorMichal Hrusecky <Michal@Hrusecky.net>
Fri, 11 May 2012 18:46:15 +0000 (20:46 +0200)
committerMichal Hrusecky <Michal@Hrusecky.net>
Fri, 11 May 2012 18:46:15 +0000 (20:46 +0200)
commit7d354a19a2714661b57d29f366ef2c24785b4e88
treea42ad4729a39e51a153ba090f58620636b02e610
parent3aef1da583566a1f859be76edd70e0e6e77cd49e
parente26b0fa3ef91a7652402e15fe38bc2e3085d1714
Merge branch 'launchpad-trunk'

Conflicts:
debian/changelog
debian/control

Deleted control and kept Ubuntu changes file as upstream changelog