merge 5.2 and resolve conflicts
authorMichael Vogt <michael.vogt@ubuntu.com>
Tue, 22 May 2012 15:40:01 +0000 (17:40 +0200)
committerMichael Vogt <michael.vogt@ubuntu.com>
Tue, 22 May 2012 15:40:01 +0000 (17:40 +0200)
commitb6d93c82d597ab4f44bc3d7469061d407deba975
tree5e3cb461f39c057b893f6c251d7ec356a9b59eb8
parent245e5f48693ff1a05843cc28555e82bb38f3deb3
parenta139cd43536e742a90beb9751704a18e587d7ac3
merge 5.2 and resolve conflicts
softwarecenter/ui/gtk3/views/catview_gtk.py
test/gtk3/test_catview.py