Merge remote branch 'origin/master'
commitf178df8d1fea91dd94a0e15bec48287d7c5fdebb
authorPootle server <pootle@cihar.com>
Sat, 25 Sep 2010 18:40:11 +0000 (25 20:40 +0200)
committerPootle server <pootle@cihar.com>
Sat, 25 Sep 2010 18:40:11 +0000 (25 20:40 +0200)
treeaa129fc52b4354238bd65aa126e88e75d2c68392
parent8dfc7985986d2059f510b558b21259ad5a833b90
parent8cf1e880f5972e09134fc6dedfb2373ae004bfe6
Merge remote branch 'origin/master'