Merge branch 'develop' into rename_with_special_character
authorjabarros <jabarros@solidgear.es>
Fri, 26 Dec 2014 13:27:52 +0000 (14:27 +0100)
committerjabarros <jabarros@solidgear.es>
Fri, 26 Dec 2014 13:27:52 +0000 (14:27 +0100)

Trivial merge