Merge remote-tracking branch 'origin/master'
commit42b95e3bfb708f1ce7a98e8feb5ebf318ee0686e
authorPootle server <pootle@cihar.com>
Sat, 24 Dec 2011 17:40:12 +0000 (24 18:40 +0100)
committerPootle server <pootle@cihar.com>
Sat, 24 Dec 2011 17:40:12 +0000 (24 18:40 +0100)
tree871066d5ee6f3ed09e9c638aff2fd428743a1523
parent6175fa3a54ef9c3173e956d792fe8ff4276034b5
parent25b78bef1b0595ef37c2855d0f070563d8e80116
Merge remote-tracking branch 'origin/master'