Dolda2000 GitWeb / ashd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8d4ed5 0b7964e)
Merge branch 'master' into sslres
authorFredrik Tolf <fredrik@dolda2000.com>
Wed, 9 Mar 2011 00:18:16 +0000 (01:18 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Wed, 9 Mar 2011 00:18:16 +0000 (01:18 +0100)

Trivial merge
A Sane HTTP Daemon