projects / web/konrad/smoke.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee95985 1363b95)
Merge branch 'master' of git://silmor.de/konrad/smoke
authorKonrad Rosenbaum <konrad@silmor.de>
Mon, 9 Apr 2012 19:55:38 +0000 (21:55 +0200)
committerKonrad Rosenbaum <konrad@silmor.de>
Mon, 9 Apr 2012 19:55:38 +0000 (21:55 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.