]> git.jsancho.org Git - gacela.git/commit
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)
commitc7f30b42f3c1d53f26a48c8bbcdea9aab608d306
treede11d4ed249fc7b1ce3f0a7548599b7115c080d8
parent485b6b1dd78e5d06c9db70c414f66a8c26332ad9
parente3f87984304fb4275c4edf3a187b43f6267cb2d1
Merge with 314:ebaa79d516f3