Merge branch 'develop' into thumbnailForUpload
authorjabarros <jabarros@solidgear.es>
Mon, 29 Dec 2014 08:27:50 +0000 (09:27 +0100)
committerjabarros <jabarros@solidgear.es>
Mon, 29 Dec 2014 08:27:50 +0000 (09:27 +0100)

Trivial merge