Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 2 Oct 2011 19:27:09 +0000 (21:27 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 2 Oct 2011 19:27:09 +0000 (21:27 +0200)
commite137ec4ecf166320ce92d5068e864034e19b8f48
tree5208d4f9fad47b59a1e046b4920ea22aa8ad806e
parent84aed1ea54ea5e482d3e7dcd7075188062ae85b1
parent546f69c87df84eece09b55197a6968640a991f66
Merge commit 'origin/master' into next

Conflicts:
lfs/libevent2
lfs/transmission
src/paks/transmission/install.sh
src/paks/transmission/uninstall.sh
lfs/libevent2
make.sh