Viewing all changes in revision 1689.

Committer: Mario Frasca
Date: 2015-06-08 22:59:11 UTC
mfrom: <a title="Merged From 1465.1.205" href="/~mfrasca/bauble/master/revision/1465.1.205">(1465.1.205)
Revision ID: git-v1:d363d7ad6c0a367f6d9543313556a217625155f5

Merge branch 'master' of https://github.com/Bauble/bauble.classic

Conflicts:
po/id.po

added added

removed removed