Merge branch 'develop' into improve_action_bar_pr_392_with_develop
authormasensio <masensio@solidgear.es>
Thu, 3 Apr 2014 09:11:13 +0000 (11:11 +0200)
committermasensio <masensio@solidgear.es>
Thu, 3 Apr 2014 09:11:13 +0000 (11:11 +0200)
commitbd8e442d3aeeae07ed51754a75ac19f3946c7197
tree3e1c26e6b3556bc94a90a79dbd55af140c0579de
parentd164646e289306ae85a2b2b9b3f952c2ddac0fe5
parent7a9149a66ab8caffbec4f0eaf46cd5615e19e1e4
Merge branch 'develop' into improve_action_bar_pr_392_with_develop