projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42499c8 9499dd7)
Merge with daurnimator
authorWaqas Hussain <waqas20@gmail.com>
Fri, 30 May 2014 22:31:26 +0000 (18:31 -0400)
committerWaqas Hussain <waqas20@gmail.com>
Fri, 30 May 2014 22:31:26 +0000 (18:31 -0400)

Trivial merge