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

Trivial merge