Merge branch 'devel/master' into devel/new_mesh 18/42318/1
authorFrancisco Santos <f1.santos@samsung.com>
Thu, 25 Jun 2015 14:53:25 +0000 (15:53 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Thu, 25 Jun 2015 14:54:34 +0000 (15:54 +0100)
commitb73149dfa1530bab210be84de4c69cbe6f2e0d14
tree8c817a3513c0891f72c47ef10d7d3ebe538d73a3
parentb8abf2a0097b3545815a5bd31eeb45fdc76ffa4b
parent8a5c094d4d5313cfa3b21f2e8a4b670a2a7ac341
Merge branch 'devel/master' into devel/new_mesh

Change-Id: Ie51fa61a8ef7c904635b99c9bf39185c10efd2bf