resolve conflicts in merge from master

Merge remote-tracking branch 'origin/master' into feature/sourcecpp-local-includes

Conflicts:
	ChangeLog

Author: jjallaire

.travis.yml

@@ -17,10 +17,11 @@ before_install:
   - curl -OL http://raw.github.com/craigcitro/r-travis/master/scripts/travis-tool.sh
   - chmod 755 ./travis-tool.sh
   - ./travis-tool.sh bootstrap
+  - sudo add-apt-repository -y ppa:edd/misc
+  - sudo apt-get update -q
 
 install:
-  - ./travis-tool.sh install_aptget r-cran-runit
-  - ./travis-tool.sh install_r inline rbenchmark highlight pkgKitten
+  - ./travis-tool.sh install_aptget r-cran-runit r-cran-inline r-cran-rbenchmark r-cran-highlight r-cran-pkgkitten
 
 script: 
   - ./travis-tool.sh run_tests

ChangeLog

@@ -3,6 +3,11 @@
         * src/attributes.cpp: Allow includes of local files
         (e.g. #include "foo.hpp") in sourceCpp
 
+2015-02-13  Dirk Eddelbuettel  <edd@debian.org>
+
+        * .travis.yml (install): Switch to using ppa:edd/misc to install all the
+        R packages needed for the Travis CI run as r-cran-* binary packages
+
 2015-02-13  JJ Allaire  <jj@rstudio.org>
 
         * src/attributes.cpp: Allow 'R' to come immediately after '***'