Merge branch 'develop' into improve_action_bar_pr_392_with_develop
authormasensio <masensio@solidgear.es>
Wed, 2 Apr 2014 08:45:52 +0000 (10:45 +0200)
committermasensio <masensio@solidgear.es>
Wed, 2 Apr 2014 08:45:52 +0000 (10:45 +0200)
commitb50072b019a27149be0387e3b922291407b4d1c0
treebc486aa2592b8307b671cd557fdbd153cd2daa3b
parentf7bc72f21dacfe7061b739b793a190a913d09454
parent1037fd1b08f03827a931e7d0559abc2cfd5d3357
Merge branch 'develop' into improve_action_bar_pr_392_with_develop