Merge remote-tracking branch 'origin/master'
commitb35747d4e572e489878a0dbfed7ff7b71ac4f192
authorPootle server <pootle@cihar.com>
Fri, 2 Dec 2011 01:40:22 +0000 (2 02:40 +0100)
committerPootle server <pootle@cihar.com>
Fri, 2 Dec 2011 01:40:22 +0000 (2 02:40 +0100)
tree7fe4ddf594305eb446a0a58548faf6a474282246
parent2c79eae32337576cb981f42f9df99a18bb6026e0
parentd39a2309922e5646034262a37024b1bdb363a207
Merge remote-tracking branch 'origin/master'