git://git.novaco.in
/
p2pool.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7d35854
38659d7
)
Merge branch 'unstable' of git://github.com/forrestv/p2pool into user_messages
author
gyver
<lionel-dev@bouton.name>
Sun, 14 Aug 2011 12:06:46 +0000 (14:06 +0200)
committer
gyver
<lionel-dev@bouton.name>
Sun, 14 Aug 2011 12:06:46 +0000 (14:06 +0200)
1
2
p2pool/main.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
p2pool/main.py
Simple merge
git://git.novaco.in / p2pool.git / commitdiff