Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 5 Jul 2013 07:22:52 +0000 (09:22 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 5 Jul 2013 07:22:52 +0000 (09:22 +0200)

Trivial merge