Merge remote branch 'origin/master'
commitf067c490adc31288e8d813da0a607536743fb6b4
authorPootle server <pootle@cihar.com>
Sat, 22 Jan 2011 13:40:23 +0000 (22 14:40 +0100)
committerPootle server <pootle@cihar.com>
Sat, 22 Jan 2011 13:40:23 +0000 (22 14:40 +0100)
tree741785ddcc59cc69acc131911aa778fe1ec82365
parenta8f6886a242c50517f0a5377dadf64414dbaa627
parent3a739c1beec1d300bf0d54d8b7f3136f1775fcee
Merge remote branch 'origin/master'