Merge branch 'master' of git+ssh://dev.laptop.org/git/journal-activity
commit5e819a078049f94aeacc32729f37d4e00a2cd479
authorPootle Translation <pootle@dev.laptop.org>
Tue, 27 May 2008 04:30:17 +0000 (27 00:30 -0400)
committerPootle Translation <pootle@dev.laptop.org>
Tue, 27 May 2008 04:30:17 +0000 (27 00:30 -0400)
tree2cb486b4adcf1dc07fa91d2fdb48ba6da6ffca4d
parentf7e7009a8eaf9d859299f31444017b800b8ff8bb
parentf7cb3ee726510246af7ab0d64bd0d15d0e6886e3
Merge branch 'master' of git+ssh://dev.laptop.org/git/journal-activity