Merge remote branch 'pootle/master'
commitd6d79aedbae33719c82813081a641b0377a97418
authorMichal Čihař <mcihar@novell.com>
Thu, 13 Jan 2011 12:23:31 +0000 (13 13:23 +0100)
committerMichal Čihař <mcihar@novell.com>
Thu, 13 Jan 2011 12:23:31 +0000 (13 13:23 +0100)
tree21178a6b3a1e5ee3b3bda970f527dc7509277531
parent9946b82a9edfbcb6c7fc6939528920b5d4ff81bc
parent9d90fb1ce4a58785bc01136ce2631b298fc6edef
Merge remote branch 'pootle/master'