Merge remote-tracking branch 'origin/master'
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 9 Oct 2012 12:54:14 +0000 (14:54 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 9 Oct 2012 12:54:14 +0000 (14:54 +0200)

Trivial merge