Merge branch 'master' of git+ssh://dev.laptop.org/git/journal-activity
commit3a20fa8d5005ef76734099e57510f796aaedea31
authorPootle Translation <pootle@dev.laptop.org>
Sat, 26 Jan 2008 16:56:01 +0000 (26 11:56 -0500)
committerPootle Translation <pootle@dev.laptop.org>
Sat, 26 Jan 2008 16:56:01 +0000 (26 11:56 -0500)
treeed6d4880360b2f42dc42388124196b00123f8a26
parentf89bee81e628515d9d372bb0388ccb22a7e920d2
parent2dd78fc9b3016eb5ffd2bdb7eaaea7f60372e2dc
Merge branch 'master' of git+ssh://dev.laptop.org/git/journal-activity