Merge branch 'develop' into review_build_process
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 29 Oct 2013 12:56:27 +0000 (13:56 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 29 Oct 2013 12:56:27 +0000 (13:56 +0100)

Trivial merge