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)
commit92e8194f186d739ae6e6150b2cb526898811035e
tree5826d71025734dcc8b2c3fd92a38bcbe98cb7e35
parent154188c38f46865d525a6962fdfdc4f72d47c777
parent0df8f178de55e985641d33e4cd8f988280edb910
Merge branch 'develop' into community_rotateImage