projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 218bfa2 e0709aa)
Merge with Zash
authorMatthew Wild <mwild1@gmail.com>
Thu, 26 Jan 2012 18:47:59 +0000 (18:47 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 26 Jan 2012 18:47:59 +0000 (18:47 +0000)

Trivial merge