-
Committer:
Robert Bruce Park
-
Date:
2013-03-14 02:27:36 UTC
-
mfrom:
(167.3.4 geotagging)
-
mto:
This revision was merged to the branch mainline in
revision
172.
-
Revision ID:
robert.park@canonical.com-20130314022736-rb45nd62dzpiqvvc
Merge lp:~robru/friends/geotagging and resolve conflicts.