projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1467aea
ed2d537
)
Merged with 0.6.
author
Waqas Hussain
<waqas20@gmail.com>
Sun, 22 Nov 2009 16:55:58 +0000
(21:55 +0500)
committer
Waqas Hussain
<waqas20@gmail.com>
Sun, 22 Nov 2009 16:55:58 +0000
(21:55 +0500)
1
2
core/sessionmanager.lua
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/sessionmanager.lua
Simple merge