Merge remote-tracking branch 'origin/onelab' into onelab
authorJavier García <javier.garcial.external@atos.net>
Mon, 27 Apr 2015 09:18:19 +0000 (11:18 +0200)
committerJavier García <javier.garcial.external@atos.net>
Mon, 27 Apr 2015 09:18:19 +0000 (11:18 +0200)

Trivial merge