Merge commit 'tuncer/for-jesper'master
commitc6b9d360700c95b269d5707bf765f3cc030051da
authorJesper Louis Andersen <jesper.louis.andersen@gmail.com>
Mon, 23 Feb 2009 18:57:49 +0000 (23 19:57 +0100)
committerJesper Louis Andersen <jesper.louis.andersen@gmail.com>
Mon, 23 Feb 2009 18:57:49 +0000 (23 19:57 +0100)
tree88af86c7c677c3fe6794aeff91e2af9b393c9534
parentfdedb133f0c06af20760ce52fac7ff600ef48b77
parent8897863df106ab9eb94eff5589aa1b2b23a5dc53
Merge commit 'tuncer/for-jesper'

Conflicts:

lib/etorrent-1.0/src/etorrent_rate.erl

Simple fix by updating exports list.
lib/etorrent-1.0/src/etorrent.erl
lib/etorrent-1.0/src/etorrent_rate.erl