summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2010-09-13 12:56:45 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2010-09-13 12:56:48 +0100
commitd1bb98dd96716f7a2d47c54730b2507d95297c85 (patch)
tree95c54888d34a307fb8621828df9f7538c96e41f8
parent627d5da2a055da063e01644aa88155df02c29ede (diff)
parent4d5e110c58c9c722443a16bb286678199668452b (diff)
parent666b8012ea593db2c7ce060040a0d91c9b6db784 (diff)
Merge branches 'misc-leaks' and 'account-27806'
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27806 Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30118