Merge branch 'develop' into review_build_process
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 30 Oct 2013 12:46:14 +0000 (13:46 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 30 Oct 2013 12:46:14 +0000 (13:46 +0100)

Trivial merge