[R/epel7: 11/11] Merge in 3.0.2-4 from master

[Orion Poplawski]

commit 97cbe426cf19d7b963e89c56bae2d6e3cf694de4
Merge: cd700c9 03a7b76
Author: Orion Poplawski <orion at nwra.com>
Date:   Fri Feb 7 10:34:31 2014 -0700

    Merge in 3.0.2-4 from master

 .gitignore                        |    3 +
 R-2.14.1-Adapt-to-PCRE-8.30.patch |   35 ------
 R-2.15.2-makeinfov5.patch         |  234 -------------------------------------
 R-2.7.2-filter_asoption.patch     |   11 --
 R-cairo-fix.patch                 |   37 ------
 R.spec                            |   21 +++-
 6 files changed, 22 insertions(+), 319 deletions(-)
---