Merged in changes from branches/Pootle-diet-and-trunk-merge.
commit8819784735dcb4d0256f15d312c66c750f3ad9cd
authorwinterstream <winterstream@54714841-351b-0410-a198-e36a94b762f5>
Tue, 1 Jul 2008 11:23:36 +0000 (1 11:23 +0000)
committerwinterstream <winterstream@54714841-351b-0410-a198-e36a94b762f5>
Tue, 1 Jul 2008 11:23:36 +0000 (1 11:23 +0000)
tree33d5ed133e1d790ed8b735f1a21e137c8711acf7
parent510b6b93dd609b0d82d94685755668f1792bde40
Merged in changes from branches/Pootle-diet-and-trunk-merge.

Please see the branch if you are interested in the changes that
led to this commit.

git-svn-id: http://translate.svn.sourceforge.net/svnroot/translate/src/trunk/Pootle@7686 54714841-351b-0410-a198-e36a94b762f5
12 files changed:
benchmark.py
conflict2suggest.py
indexpage.py
pootle.py
pootlefile.py
potree.py
projects.py
statistics.py
templates/navbar.html
test_pootlefile.py
test_statistics.py [deleted file]
translatepage.py