Dolda2000 GitWeb / ashd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a83cfbb 50140c8)
Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Tue, 13 Dec 2011 01:57:27 +0000 (02:57 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Tue, 13 Dec 2011 01:57:27 +0000 (02:57 +0100)

Trivial merge
A Sane HTTP Daemon