projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6925cdc 9d5c270)
Merge 0.9->trunk
authorWaqas Hussain <waqas20@gmail.com>
Sat, 22 Sep 2012 20:13:08 +0000 (01:13 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Sat, 22 Sep 2012 20:13:08 +0000 (01:13 +0500)
1  2 
prosodyctl patch | diff1 | diff2 | blob | history

diff --cc prosodyctl
Simple merge