Merge branch 'develop' into refactor_update_filelist_from_database
authormasensio <masensio@solidgear.es>
Mon, 28 Apr 2014 10:10:37 +0000 (12:10 +0200)
committermasensio <masensio@solidgear.es>
Mon, 28 Apr 2014 10:10:37 +0000 (12:10 +0200)

Trivial merge