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)
commitda876348045ca0b0c66e79ca2a7b7dd7d141cad7
tree2d605f9efcf75672afe8bd1e2ec691004af649b7
parentec820a29ac8bef120e075a8c5b9f078092fa475c
parent0b7c37671fe97fafaa177cbea22a1d169d52deb8
Merge branch 'develop' into rename_with_special_character