Merge remote-tracking branch 'origin/master'
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 26 Jun 2013 16:11:29 +0000 (18:11 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 26 Jun 2013 16:11:29 +0000 (18:11 +0200)

Trivial merge