Merge branch 'master' into temporal_icons oc-android-1-3-19
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 31 Jan 2013 11:50:03 +0000 (12:50 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 31 Jan 2013 11:50:03 +0000 (12:50 +0100)
commit82ee5c46eea51198eb055eec84526673fd04e977
tree28718ca4c44735cb3a1d461028eae3c62895d202
parent13b75b73e3dcd7c6794f9beee4a538fc900bc94d
parent543b3cc24d23c9b2c7633b2b8286b0af0e73723e
Merge branch 'master' into temporal_icons