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)
commit13b75b73e3dcd7c6794f9beee4a538fc900bc94d
treea635f858602c0973576143c8ceafb8aae6f177df
parent1a8096380dc4ca0aa33165d443081e48904ca3be
parentfdd1dbf2d702214f1c6ac435f06ff02e29f5a6b8
Merge branch 'master' into temporal_icons