]> git.jsancho.org Git - gacela.git/commitdiff
Merge with 314:ebaa79d516f3
authorJavier Sancho <jsf@jsancho.org>
Sat, 12 May 2012 18:28:32 +0000 (20:28 +0200)
committerJavier Sancho <jsf@jsancho.org>
Sat, 12 May 2012 18:28:32 +0000 (20:28 +0200)

Trivial merge