projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ab4e27 77c3bb3)
Merge with Zash
authorMatthew Wild <mwild1@gmail.com>
Sun, 29 Jul 2012 01:28:25 +0000 (02:28 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 29 Jul 2012 01:28:25 +0000 (02:28 +0100)

Trivial merge