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)
commit9c03c10790f01235f0b4734ef84d0f517b38d5e7
tree20ba59b0ce47e995559a416af911067b4f528480
parentdf394c71be42d9d122de869088f3de377a1d985a
parent99fb630273cb671b310f2702a81a5bcc203fe5b7
Merge branch 'develop' into refresh_folder_contents_when_browsed_into