Merge "Author: Luke Hinds <lhinds@redhat.com> Date: Mon 18 Apr 11:48:27 2016 +0100"
authorMorgan Richomme <morgan.richomme@orange.com>
Mon, 18 Apr 2016 15:54:55 +0000 (15:54 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 18 Apr 2016 15:54:55 +0000 (15:54 +0000)
commitf731974343c71ef02ec5d99d3fbae9ee2adb4115
tree1d02dca64042a5b15d15529a635e59584b454780
parent99e12689825a0fb827f8b966a3a82fb91106b160
parent62185d58e1376fdbd2ec58cb9d592954d09fbd3d
Merge "Author: Luke Hinds <lhinds@redhat.com> Date:   Mon 18 Apr 11:48:27 2016 +0100"