Merge branch 'develop' into review_build_process
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 4 Nov 2013 11:21:57 +0000 (12:21 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 4 Nov 2013 11:21:57 +0000 (12:21 +0100)

Trivial merge