Merge branch 'develop' into refactor_update_filelist_from_database
authormasensio <masensio@solidgear.es>
Mon, 19 May 2014 06:29:28 +0000 (08:29 +0200)
committermasensio <masensio@solidgear.es>
Mon, 19 May 2014 06:29:28 +0000 (08:29 +0200)

Trivial merge