Merge remote-tracking branch 'origin/move_files_and_folders' into move_files_and_folders
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 26 Aug 2014 17:32:41 +0000 (19:32 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 26 Aug 2014 17:32:41 +0000 (19:32 +0200)

Trivial merge