Dolda2000 GitWeb / ashd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de6c035 92db680 62705f8)
Merge branches 'block' and 'py-reserve'
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 3 Feb 2013 02:29:45 +0000 (03:29 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 3 Feb 2013 02:29:45 +0000 (03:29 +0100)

Trivial merge
A Sane HTTP Daemon