Merge branch 'develop' into navigation_drawer
authormasensio <masensio@solidgear.es>
Mon, 18 May 2015 13:04:15 +0000 (15:04 +0200)
committermasensio <masensio@solidgear.es>
Mon, 18 May 2015 13:04:15 +0000 (15:04 +0200)
commit25718e7992ac273156f58d679ffc2cf3dad0c3c3
treeb0ff414edd64ad8a9f3fdde0ba42c0aedc092e7c
parenta496f0871713084015aae8e36b7093671907146a
parentf25acde9124da2c9b8425c2763b1169db7b4a325
Merge branch 'develop' into navigation_drawer