Merge branch 'develop' into community_rotateImage
authorjabarros <jabarros@solidgear.es>
Thu, 11 Dec 2014 07:51:31 +0000 (08:51 +0100)
committerjabarros <jabarros@solidgear.es>
Thu, 11 Dec 2014 07:51:31 +0000 (08:51 +0100)

Trivial merge