Merge branch 'master' of ssh://git.code.sf.net/p/ecls/ecl
authorJuanjo Garcia-Ripoll <jjgarcia@users.sf.net>
Sun, 27 Oct 2013 22:50:14 +0000 (23:50 +0100)
committerJuanjo Garcia-Ripoll <jjgarcia@users.sf.net>
Sun, 27 Oct 2013 22:50:14 +0000 (23:50 +0100)

Trivial merge