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)

Trivial merge