Merge tag '2.1.2' into 2.1

Many type cleanups, new resolver, new types and updated documentation
2013-07-09 17:56:19 +02:00 · 2013-07-09 17:56:19 +02:00 · cf592e7260
parent d6d56043ce 40acd27319
commit cf592e7260
1 changed files with 0 additions and 1 deletions
--- a/bin/build-helper
+++ b/bin/build-helper
@ -109,7 +109,6 @@ eof
        to_a=cdist
        to_d=l.schottelius.org
        to=${to_a}@${to_d}
-        to=n@schottelius.org

        from_a=nico-cdist
        from_d=schottelius.org