Merge remote branch 'origin/master'
commit16d41c6597eb9f68444cfa821b239e54a780a722
authorPetr Baudis <pasky@ucw.cz>
Wed, 15 Dec 2010 17:55:39 +0000 (15 18:55 +0100)
committerPetr Baudis <pasky@ucw.cz>
Wed, 15 Dec 2010 17:55:39 +0000 (15 18:55 +0100)
tree869fb63797032737f22480a9850d9051967b3332
parentea84ca9a17e3cd168434c8e35a55e89f8edd78b7
parentbd2176ad9801e700faa97d6d102d81eab113c554
Merge remote branch 'origin/master'