summaryrefslogtreecommitdiff
diff options
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2014-03-06 05:25:19 +0100
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2014-03-06 05:25:19 +0100
commitae4a2cf18a16f40085a3519a3ffd7131e4c805af (patch)
tree533aec8ae9f3fec2bdd582f4553a2f19f68a1047
parentb1e4439242a58d9c95f7cf192236a83e2a8222ae (diff)
parentd992585c2323aa05fd53d86e485ee53f0db13241 (diff)
Merging with latest lp:~andyrock/unity/lockscreen
(bzr r3695.4.33)