Merge remote branch 'origin/pootle-import' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Thu, 21 Apr 2011 14:53:27 +0000 (16:53 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Thu, 21 Apr 2011 14:53:27 +0000 (16:53 +0200)

Trivial merge