Merge remote-tracking branch 'origin/master'
commitfef3a1aac758271ed8d2988567537557e2f4263d
authorPootle server <pootle@cihar.com>
Thu, 29 Sep 2011 16:40:18 +0000 (29 18:40 +0200)
committerPootle server <pootle@cihar.com>
Thu, 29 Sep 2011 16:40:18 +0000 (29 18:40 +0200)
treeeadc89723b982f8f560d43be4363eff4397ca182
parent9f0dc82af0ab33e0c1602bdb4d35f89e22f47632
parentabe93510a28dd5286518d80f6ca9c4bd7c9b7983
Merge remote-tracking branch 'origin/master'