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

[Tom Callaway]

commit 1f0156b2b00bb32f07f52f96b3cd37bfcb1d6158
Merge: ca61645 8fea429
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Wed Nov 9 13:34:19 2011 -0500

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

 R-mvtnorm.spec |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --cc R-mvtnorm.spec
index 8d9b565,4830261..b4ee043
--- a/R-mvtnorm.spec
+++ b/R-mvtnorm.spec
@@@ -62,11 -71,9 +62,13 @@@ rm -rf %{buildroot
  
  
  %changelog
 +* Tue Nov 8 2011 Tom Callaway <spot at fedoraproject.org> - 0.9.9991-1
 +- update spec
- - update to 0.9-9991
 +- rebuild for R-2.14.0
 +
+ * Mon Nov 8 2011 Orion Poplawski <orion at cora.nwra.com> - 0.9-9991
+ - Update to 0.9-9991
+ 
  * Tue Feb 8 2011 Orion Poplawski <orion at cora.nwra.com> - 0.9-96
  - Update to 0.9-96