Merge branch 'master', remote branch 'pootle/master'
commit2b56e3676cf3c1d98eb2a5635c401eb14c13c566
authorMichal Čihař <michal@cihar.com>
Mon, 18 Jan 2010 09:49:55 +0000 (18 10:49 +0100)
committerMichal Čihař <michal@cihar.com>
Mon, 18 Jan 2010 09:49:55 +0000 (18 10:49 +0100)
tree016e54f59488d739f77b76f2bc93c993cfe8e261
parent90ce4916776752f2bbb09683c66207704076d653
parente041c7c8795bf0df24cd29ce1b53d7b1a97c483d
Merge branch 'master', remote branch 'pootle/master'