projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1357b49 76b330a)
Merge with Zash
authorMatthew Wild <mwild1@gmail.com>
Sat, 3 Mar 2012 01:12:16 +0000 (01:12 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 3 Mar 2012 01:12:16 +0000 (01:12 +0000)

Trivial merge