]> err.no Git - util-linux/commit
Merge commit 'origin/master'
authorScott James Remnant <scott@ubuntu.com>
Thu, 16 Jul 2009 11:49:23 +0000 (12:49 +0100)
committerScott James Remnant <scott@ubuntu.com>
Thu, 16 Jul 2009 11:53:55 +0000 (12:53 +0100)
commit1237c6b2fa2ea0d4918302e2cc818b2829df0c9e
tree3853c54302eeebda17e2ca7a700d7deaa727859d
parent4e13a18f57a5b427c559f3b466b9655db14d28f8
parent29e107aac49c5b922ae84e703ee031b447d368c7
Merge commit 'origin/master'

Conflicts:
AUTHORS
NEWS
config/include-Makefile.am
configure.ac
mount/lomount.c
po/POTFILES.in
po/ca.po
po/cs.po
po/da.po
po/de.po
po/es.po
po/et.po
po/eu.po
po/fi.po
po/fr.po
po/hu.po
po/id.po
po/it.po
po/ja.po
po/nl.po
po/pl.po
po/pt_BR.po
po/ru.po
po/sl.po
po/sv.po
po/tr.po
po/uk.po
po/util-linux-ng.pot
po/vi.po
po/zh_CN.po
hwclock/hwclock.c
login-utils/Makefile.am
mount/Makefile.am
mount/lomount.c
mount/losetup.8
mount/mount.8
mount/mount.c