Merge remote branch 'pootle/master'
commit9946b82a9edfbcb6c7fc6939528920b5d4ff81bc
authorMichal Čihař <mcihar@novell.com>
Thu, 13 Jan 2011 12:19:40 +0000 (13 13:19 +0100)
committerMichal Čihař <mcihar@novell.com>
Thu, 13 Jan 2011 12:19:40 +0000 (13 13:19 +0100)
treea8df6fa00b0a813a93445dce8e78e716e5ef1a58
parent7ee006ff8b5dcb75d2f1b837e7a661de0e7aea14
parente5e05312dbe1b7ffebcdf850b88e2c56213060d1
Merge remote branch 'pootle/master'