Merge branch 'master' into temporal_icons
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 30 Jan 2013 15:17:41 +0000 (16:17 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 30 Jan 2013 15:17:41 +0000 (16:17 +0100)

Trivial merge