[R-lmtest: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/R-lmtest

[Tom Callaway]

commit 7fb50c62c266f87bc1f58b07bd297653cdf8f708
Merge: e60c171 5f30238
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Thu Nov 10 10:20:40 2011 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/R-lmtest
    
    Conflicts:
    	R-lmtest.spec

 R-lmtest.spec |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --cc R-lmtest.spec
index abd8a06,a0997e4..98479dd
--- a/R-lmtest.spec
+++ b/R-lmtest.spec
@@@ -67,9 -67,12 +67,11 @@@ rm -rf $RPM_BUILD_ROO
  %changelog
  * Tue Nov 8 2011 Tom Callaway <spot at fedoraproject.org> 0.9.29-1
  - update to new R packaging model
--- update to 0.9-29
  - rebuild against R 2.14.0
  
+ * Mon Nov 7 2011 Orion Poplawski <orion at cora.nwra.com> 0.9-29
+ - Update to 0.9-29
+ 
  * Tue Feb 8 2011 Orion Poplawski <orion at cora.nwra.com> 0.9-28
  - Update to 0.9-27