Merge branch 'develop' into refactor_update_filelist_from_database
authormasensio <masensio@solidgear.es>
Wed, 14 May 2014 06:58:04 +0000 (08:58 +0200)
committermasensio <masensio@solidgear.es>
Wed, 14 May 2014 06:58:04 +0000 (08:58 +0200)

Trivial merge