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)
commit3ffc515f42833fc54f34f29499452a1bf2a19216
tree2c2c203b17a9c83c35220fb26273c7282fb0aad2
parentdad222191608dd903e7247615fe9abc1b6c74e39
parent99fb630273cb671b310f2702a81a5bcc203fe5b7
Merge branch 'develop' into fixed_permanent_redirections