Merge remote-tracking branch 'micro/fix-build'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 16 Mar 2015 08:43:38 +0000 (09:43 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 16 Mar 2015 08:43:38 +0000 (09:43 +0100)
commit29b956745586e58ce61cd66c1ebf48a625bb0ae7
tree65f1386d888408dcbd582219a5f67bab247b935e
parent22a1f0d6b93976416b8f4cdb0971d835e7d639c9
parentf815a6b963bcb7ed8ca2e2c24b66e1858f0e01a0
Merge remote-tracking branch 'micro/fix-build'