projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11d94e9 ea1e4b3)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 5 Jun 2011 00:54:06 +0000 (01:54 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 5 Jun 2011 00:54:06 +0000 (01:54 +0100)
1  2 
util/xmppstream.lua patch | diff1 | diff2 | blob | history

diff --cc util/xmppstream.lua
Simple merge