Merge branch 'develop' into refresh_folder_contents_when_browsed_into
authormasensio <masensio@solidgear.es>
Tue, 24 Sep 2013 12:29:18 +0000 (14:29 +0200)
committermasensio <masensio@solidgear.es>
Tue, 24 Sep 2013 12:29:18 +0000 (14:29 +0200)
commitc77919b96c88830c8968e3b534e45747a153434a
treea3b00bebb8d905cd8369c38979b0fed59a4f7ecb
parent801475b92458edc9c8fba552a878e403626852c1
parentab6b82750e2f99dad49c99de913dd0f208fda244
Merge branch 'develop' into refresh_folder_contents_when_browsed_into