From: Richard Hartmann <richih.mailinglist@gmail.com>
Date: Sat, 26 Nov 2011 22:32:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'Dieter_be/master'
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/4b21d241422c84a3cd54cdd19e59c5110c2908f2?hp=2309790bb91081d044c8385b6d9e29780143e5db

Merge remote-tracking branch 'Dieter_be/master'

Conflicts:
	doc/error_codes.md
---

diff --git a/doc/error_codes.md b/doc/error_codes.md
index 008d4a1..e127e7d 100644
--- a/doc/error_codes.md
+++ b/doc/error_codes.md
@@ -17,5 +17,3 @@
 * 57: Could not write to file
 * 57: Could not delete directory
 * 59: Could not delete file
-
-* 99: Error code reserved for actions that should never happen