tree cb517cc6890002bcbb950a8fd8963a35300f701e
parent 57697f9ef826d2ba5490daee8ff55004d0635c7f
parent 8bcea0f617454d4856cb9809f97dbe4918067ef9
author tierno <alfonso.tiernosepulveda@telefonica.com> 1493211964 +0200
committer tierno <alfonso.tiernosepulveda@telefonica.com> 1493211964 +0200

Merge branch 'v2.0'

Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>