Merge branch 'master' of git://repo.or.cz/ozulis
commit8120b617ad56da95987918528bf03a49b2e7ff26
authorAlexandre Bique <bique.alexandre@gmail.com>
Wed, 13 May 2009 20:24:43 +0000 (13 21:24 +0100)
committerAlexandre Bique <bique.alexandre@gmail.com>
Wed, 13 May 2009 20:24:43 +0000 (13 21:24 +0100)
treea80828a6d518e5d4d2db78704ada7809df5d4563
parent568cac193f75531adeecd4b6d4da7882d6c9b244
parent02048c1507caf2815681f4082bd465ef948b0d19
Merge branch 'master' of git://repo.or.cz/ozulis