Merge remote branch 'origin/master'
commitfae8e48818084e3569e194f0f1a0bc07bbb49f70
authorMichal Čihař <michal@cihar.com>
Sat, 3 Apr 2010 00:40:27 +0000 (3 02:40 +0200)
committerMichal Čihař <michal@cihar.com>
Sat, 3 Apr 2010 00:40:27 +0000 (3 02:40 +0200)
treeb27be687d24b0ff486f447a4947e93f8fa8c894b
parent6d374e4db27f507f14dc5ff30005c081c87d219b
parent5c263563796e5cb8e8c4b90d1b64104b0b705aaf
Merge remote branch 'origin/master'