Merge remote-tracking branch 'origin/timestamper'
authorForrest Voight <forrest.voight@gmail.com>
Sat, 21 Jul 2012 02:38:00 +0000 (22:38 -0400)
committerForrest Voight <forrest.voight@gmail.com>
Sat, 21 Jul 2012 02:39:18 +0000 (22:39 -0400)
commit3536cc96345188fe06882393be8179c2410c60d9
tree82c7c4bf678f4302956b39fbf2960cacc8ccc409
parent246efaaeceab9421dffd502b854ce94d06226f78
parent33e15591bca79c6e952bbacb4b8524c34334e88c
Merge remote-tracking branch 'origin/timestamper'

Conflicts:
p2pool/main.py
p2pool/web.py
p2pool/data.py
p2pool/web.py
p2pool/work.py