projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a7102ee
eae624b
)
Merge 0.7->trunk
author
Waqas Hussain
<waqas20@gmail.com>
Sat, 3 Jul 2010 13:13:54 +0000
(18:13 +0500)
committer
Waqas Hussain
<waqas20@gmail.com>
Sat, 3 Jul 2010 13:13:54 +0000
(18:13 +0500)
1
2
plugins/mod_privacy.lua
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
plugins/mod_privacy.lua
Simple merge