commit b9058b6873d8488a1c9537665fa28fa39bff294d Merge: 7c9fc01 ff09b53 Author: Michel Alexandre Salim <michel at hypatia.localdomain> Date: Fri Oct 15 11:27:33 2010 +0200 Merge branch 'master' into el6 rtorrent.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---