Merge branch 'master' of git://github.com/mapleoin/popcorn into redis
authorPavol Rusnak <stick@gk2.sk>
Sat, 21 May 2011 09:40:28 +0000 (11:40 +0200)
committerPavol Rusnak <stick@gk2.sk>
Sat, 21 May 2011 09:40:28 +0000 (11:40 +0200)
commitb62909660bff33cf08656c40ed61c60a8596a007
treec72f5603228a047e75ef41328f65bd5657350b2d
parentd3ca2018093847cab5797515e0e266fe783d2381
parente023620dd75acddde822ad17ddf047cb1f630743
Merge branch 'master' of git://github.com/mapleoin/popcorn into redis

Conflicts:
popcorn-client
popcorn.spec
README
popcorn-client
popcorn.conf
popcorn.spec
server/server.cfg