Merge remote-tracking branch 'origin/master'
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 30 Oct 2012 10:25:29 +0000 (11:25 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 30 Oct 2012 10:25:29 +0000 (11:25 +0100)

Trivial merge