]> err.no Git - systemd/commit
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Sat, 20 Nov 2010 07:56:54 +0000 (08:56 +0100)
committerTollef Fog Heen <tfheen@err.no>
Sat, 20 Nov 2010 07:56:54 +0000 (08:56 +0100)
commitc9149c325656ced0d0db93073ac080a19cae27d1
tree58e6a2546baa9d162baf6cc41fd0b2ea335ca508
parent853e957aafa12c87a1ef7735ebb5bbfa197c1cc3
parenteb8642d19ce24f1ce1e5f21454f28ec87b0b987d
Merge branch 'master' into debian

Conflicts:
units/var-lock.mount
units/var-lock.mount