From: Javier Sancho <jsf@jsancho.org>
Date: Sat, 12 May 2012 18:28:32 +0000 (+0200)
Subject: Merge with 314:ebaa79d516f3
X-Git-Url: https://git.jsancho.org/?p=gacela.git;a=commitdiff_plain;h=c7f30b42f3c1d53f26a48c8bbcdea9aab608d306

Merge with 314:ebaa79d516f3
---

c7f30b42f3c1d53f26a48c8bbcdea9aab608d306