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)

Trivial merge