Merge branch 'develop' into fixed_permanent_redirections
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 3 Oct 2013 10:39:54 +0000 (12:39 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 3 Oct 2013 10:39:54 +0000 (12:39 +0200)

Trivial merge