Merge branch 'develop' into favourites_context_menu
authorpurigarcia <pgarcia@solidgear.es>
Fri, 10 Jul 2015 06:44:56 +0000 (08:44 +0200)
committerpurigarcia <pgarcia@solidgear.es>
Fri, 10 Jul 2015 06:44:56 +0000 (08:44 +0200)
commita3bfcdcd85ad864036281762471e732d54c17586
treeacd47ad4f678b9d0d5b35dcc5c7d832b32fbc7cc
parent31768aabce6803362681d0da3dc32eabfe02d543
parent1e08c40f31b3c67133dc314dbad061279a75b931
Merge branch 'develop' into favourites_context_menu