Merge remote-tracking branch 'origin/master'
commit2729e1020760dff7730e22997e31f37cabbbbb15
authorPootle server <pootle@cihar.com>
Mon, 12 Dec 2011 17:40:14 +0000 (12 18:40 +0100)
committerPootle server <pootle@cihar.com>
Mon, 12 Dec 2011 17:40:14 +0000 (12 18:40 +0100)
treed4b2fe8b8ba05a9ce29b232b86f35606df0a6285
parentd0756966fcd173ae08ad36edb8dcfaa8608db035
parent6a6b844525a782b148f235a11b77712e1d256280
Merge remote-tracking branch 'origin/master'