Merge remote branch 'origin/master'
commit6d374e4db27f507f14dc5ff30005c081c87d219b
authorMichal Čihař <michal@cihar.com>
Fri, 2 Apr 2010 22:40:19 +0000 (3 00:40 +0200)
committerMichal Čihař <michal@cihar.com>
Fri, 2 Apr 2010 22:40:19 +0000 (3 00:40 +0200)
tree5a10c6e2682f762d1fa3e5e5a3a327810a594079
parent781fca3e2fc6111649cdec9fc454ddd6378452c1
parentf32e8001e21ffb5643a245bc615c65a9db1e71b7
Merge remote branch 'origin/master'