projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c4fc4c8
2efa26b
)
Merge with 0.6
author
Matthew Wild
<mwild1@gmail.com>
Wed, 2 Dec 2009 22:15:17 +0000
(22:15 +0000)
committer
Matthew Wild
<mwild1@gmail.com>
Wed, 2 Dec 2009 22:15:17 +0000
(22:15 +0000)
1
2
util/dependencies.lua
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
util/dependencies.lua
Simple merge