Merge remote-tracking branch 'origin/master'
commitf3f17013005d1e3e68c5a966bf9bcf0260fccfa0
authorMichal Čihař <michal@cihar.com>
Tue, 13 Dec 2011 09:43:18 +0000 (13 10:43 +0100)
committerMichal Čihař <michal@cihar.com>
Tue, 13 Dec 2011 09:43:18 +0000 (13 10:43 +0100)
treeac8e2a41d0c35396017440af8182b7345dece5d7
parent11a104ef5955d35ecbf2b2a5b4d48d92f4ce8380
parentdc203395817be869c9a6d63705501682bd38c100
Merge remote-tracking branch 'origin/master'