Merge branch 'develop' into fixed_permanent_redirections
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 1 Oct 2013 10:59:57 +0000 (12:59 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 1 Oct 2013 10:59:57 +0000 (12:59 +0200)

Trivial merge