projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16f33aa c435a93)
Merge with Zash
authorMatthew Wild <mwild1@gmail.com>
Wed, 2 Nov 2011 07:17:26 +0000 (07:17 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 2 Nov 2011 07:17:26 +0000 (07:17 +0000)

Trivial merge