Merge remote-tracking branch 'rhabbachi/feature/308_sync_folder' into download_folder
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 9 Dec 2014 09:39:14 +0000 (10:39 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 9 Dec 2014 09:39:14 +0000 (10:39 +0100)

Trivial merge