Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 26 Jun 2013 16:13:11 +0000 (18:13 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 26 Jun 2013 16:13:11 +0000 (18:13 +0200)

Trivial merge