Merge branch 'develop' into refresh_folder_contents_when_browsed_into
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 8 Oct 2013 06:52:14 +0000 (08:52 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 8 Oct 2013 06:52:14 +0000 (08:52 +0200)

Trivial merge