Merge branch 'master' into v2.0 28/1628/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 21 Apr 2017 12:15:35 +0000 (14:15 +0200)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 21 Apr 2017 12:15:35 +0000 (14:15 +0200)
commit27c1c9221acccde1378a12404054f1e545de8ca5
tree46cee0d12c2e35ee0a6d1cab276ede87ee47cfd2
parent8b7767bf52e1781749e285a7e7f32bfaf88b89d6
parent57697f9ef826d2ba5490daee8ff55004d0635c7f
Merge branch 'master' into v2.0