[R-IRanges/f19: 5/5] Merge branch 'master' into f19

[Pierre-YvesChibon]

commit 676fe06ba61cac20eed98781a5afef66120d6cbf
Merge: 86fbf02 d8f125f
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Tue Jul 16 20:44:21 2013 +0200

    Merge branch 'master' into f19
    
    Conflicts:
    	R-IRanges.spec

 .gitignore     |    1 +
 R-IRanges.spec |    9 ++++++---
 sources        |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---