Merge branch 'develop' into review_build_process
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 28 Oct 2013 12:22:06 +0000 (13:22 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 28 Oct 2013 12:22:06 +0000 (13:22 +0100)

Trivial merge