projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
92549bf
5cf94a4
)
Merge 0.9->0.10
author
Kim Alvefur
<zash@zash.se>
Wed, 13 May 2015 22:22:56 +0000
(
00:22
+0200)
committer
Kim Alvefur
<zash@zash.se>
Wed, 13 May 2015 22:22:56 +0000
(
00:22
+0200)
1
2
core/s2smanager.lua
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/s2smanager.lua
Simple merge