projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a3ce0d cd018d3)
Merge 0.9->0.10
authorMatthew Wild <mwild1@gmail.com>
Tue, 24 Feb 2015 15:22:09 +0000 (15:22 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 24 Feb 2015 15:22:09 +0000 (15:22 +0000)
1  2 
configure patch | diff1 | diff2 | blob | history

diff --cc configure
Simple merge