Merge branch 'develop' into refresh_folder_contents_when_browsed_into
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 2 Oct 2013 07:29:59 +0000 (09:29 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 2 Oct 2013 07:29:59 +0000 (09:29 +0200)

Trivial merge