Merge branch 'develop' into refactor_update_filelist_from_database
authormasensio <masensio@solidgear.es>
Thu, 15 May 2014 06:52:11 +0000 (08:52 +0200)
committermasensio <masensio@solidgear.es>
Thu, 15 May 2014 06:52:11 +0000 (08:52 +0200)

Trivial merge