projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0abfe8 e0ea893)
Merge with trunk.
authorWaqas Hussain <waqas20@gmail.com>
Fri, 29 Jan 2010 16:15:33 +0000 (21:15 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Fri, 29 Jan 2010 16:15:33 +0000 (21:15 +0500)

Trivial merge