Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 4 Dec 2013 11:09:22 +0000 (12:09 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 4 Dec 2013 11:09:22 +0000 (12:09 +0100)
commit34923cf74ba9a09e10276bc919f05ddadc7ab6f7
tree8e05ae9c9e5e010100bac9adfb204dba9786554d
parenta9da7583d6dd83a88f056fc4e99ec70647ccc1c2
parent5962cdeee71718e97c8f2cf5224f9db859e56247
Merge branch 'master' into develop
AndroidManifest.xml