Merge branch 'develop' into release-1.5.3
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 22 Jan 2014 09:26:19 +0000 (10:26 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 22 Jan 2014 09:26:19 +0000 (10:26 +0100)

Trivial merge