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

Trivial merge