Merge branch '1.8-cve-2015-0245' into cve-2015-0245
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 9 Feb 2015 11:06:32 +0000 (11:06 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 9 Feb 2015 11:06:32 +0000 (11:06 +0000)
commita3c1b66b7a784280b0763ee4014c258144ae7876
treec505c8b1633b1f83ae953769741ba1c13b0bd7ae
parent239fa2081293ed26455e98b73a6c484730b00372
parent03c5e161752fe1ff4925955800ca9c78d09a6e0c
Merge branch '1.8-cve-2015-0245' into cve-2015-0245

Conflicts:
NEWS
bus/system.conf.in
configure.ac
NEWS
bus/driver.c
bus/system.conf.in