Merge remote-tracking branch 'origin/master'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 6 Nov 2015 17:36:00 +0000 (18:36 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 6 Nov 2015 17:36:00 +0000 (18:36 +0100)
commitb1e1e2919f1e3777851d0d86a93264c742a1f6d9
tree1c1f332650a066c9c70dbf7f4d2d0e7d113a2700
parent18c73c4095b7b842aacf414f6148aa10eca9faf7
parent997efd0ade85f222d4d9c2ce6d46ed92c4433e76
Merge remote-tracking branch 'origin/master'