projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 43b20a0 5c6ed1d)
Merge with Zash
authorMatthew Wild <mwild1@gmail.com>
Mon, 6 Dec 2010 17:32:35 +0000 (17:32 +0000)
committerMatthew Wild <mwild1@gmail.com>
Mon, 6 Dec 2010 17:32:35 +0000 (17:32 +0000)

Trivial merge