[R/epel7: 2/2] Merge branch 'master' into epel7

[Orion Poplawski]

commit b3f552913ddd4179fc1539bbf181a339703c3c7f
Merge: 97cbe42 086df36
Author: Orion Poplawski <orion at nwra.com>
Date:   Fri Feb 7 12:16:57 2014 -0700

    Merge branch 'master' into epel7

 R.spec |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---