Merge branch 'develop' into remove_ActionBarSherlock
authormasensio <masensio@solidgear.es>
Wed, 27 May 2015 11:10:15 +0000 (13:10 +0200)
committermasensio <masensio@solidgear.es>
Wed, 27 May 2015 11:10:15 +0000 (13:10 +0200)
commite7493203deca0edc7edeb5fb26f2774ede84a479
treec4a885dc6015effd8a1a3df90a9d9b6522fdf98d
parentd58e131dc59baf7ae895749ac5e05a274a10d500
parenta664088989e5947e14b2fce0f4e346787a2a5dfa
Merge branch 'develop' into remove_ActionBarSherlock