Merge branch 'master' of git+ssh://repo.or.cz/srv/git/Worg
authorJuan Reyero <juan@juanreyero.com>
Sat, 30 Jan 2010 09:31:09 +0000 (10:31 +0100)
committerJuan Reyero <juan@juanreyero.com>
Sat, 30 Jan 2010 09:31:09 +0000 (10:31 +0100)

Trivial merge