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)
commitdad222191608dd903e7247615fe9abc1b6c74e39
treef29f39ae1eb1aee70bcd3b67799e3461c6fe98f2
parentaa23ece118de680a4f288602f83b25a433c99d12
parent8b137845223cbcce7a16ac10ec8a2b88908bc5fa
Merge branch 'develop' into fixed_permanent_redirections