Merge tag 'upstream/3.14'

[debian/elilo] / .ChangeLog.swp

diff --git a/.ChangeLog.swp b/.ChangeLog.swp
deleted file mode 100644 (file)
index 7c1e3be..0000000
Binary files a/.ChangeLog.swp and /dev/null differ