projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: afe99fb 86d1b5a)
Merge with Zash
authorMatthew Wild <mwild1@gmail.com>
Wed, 26 Oct 2011 22:58:01 +0000 (18:58 -0400)
committerMatthew Wild <mwild1@gmail.com>
Wed, 26 Oct 2011 22:58:01 +0000 (18:58 -0400)

Trivial merge