-
Committer:
Christian Dywan
-
Date:
2013-11-20 00:13:00 UTC
-
mto:
(6441.2.48 midori)
-
mto:
This revision was merged to the branch mainline in
revision
6458.
-
Revision ID:
christian.dywan@canonical.com-20131120001300-36gsdfyvzvbbo1mc
Include wiki changes and one more merged change