Merge branch 'develop' into instant_upload_path_chooseable
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 10 Oct 2014 09:04:37 +0000 (11:04 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 10 Oct 2014 09:04:37 +0000 (11:04 +0200)

Trivial merge