projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c8dbc7 74b363a)
Merge with 0.7
authorMatthew Wild <mwild1@gmail.com>
Wed, 17 Mar 2010 14:36:23 +0000 (14:36 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 17 Mar 2010 14:36:23 +0000 (14:36 +0000)

Trivial merge