Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 10 Jul 2013 07:06:08 +0000 (09:06 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 10 Jul 2013 07:06:08 +0000 (09:06 +0200)

Trivial merge