Merge branch 'develop' into release-1.6.2
authorjabarros <jabarros@solidgear.es>
Fri, 21 Nov 2014 09:57:38 +0000 (10:57 +0100)
committerjabarros <jabarros@solidgear.es>
Fri, 21 Nov 2014 09:57:38 +0000 (10:57 +0100)
commit803ed3487449d4b07ab8e38dc15e76ea96446c3e
tree1e110edca596a4eac14a04304d507121a81bda8a
parent094fa09e9e9598e852e4719199c5990e470c4c16
parent85d5035cbd831cdfcc7cee10aa20fb53273482bf
Merge branch 'develop' into release-1.6.2