Merge branch 'develop' into delete_local_files
authorjabarros <jabarros@solidgear.es>
Mon, 19 Jan 2015 10:03:05 +0000 (11:03 +0100)
committerjabarros <jabarros@solidgear.es>
Mon, 19 Jan 2015 10:03:05 +0000 (11:03 +0100)

Trivial merge