Viewing all changes in revision 33.

Committer: Didier Roche
Date: 2012-10-04 13:31:43 UTC
mfrom: <a title="Merged From 14.2.81" href="/~ken-vandine/ubuntu/quantal/unity-lens-photos/trunk/revision/14.2.81">(14.2.81 unity-lens-photos)
Revision ID: didier.roche@canonical.com-20121004133143-in2lfbnzty6epd0b

* Cherry-pick:
- The shortcut Super + P is conflicting with the Video out hotkey
(LP: #1049090)

added added

removed removed