Merge branch 'upstream'

author Darik Horn <dajhorn@vanadac.com>

Thu, 10 Mar 2011 14:56:53 +0000 (08:56 -0600)

committer Darik Horn <dajhorn@vanadac.com>

Thu, 10 Mar 2011 14:56:53 +0000 (08:56 -0600)
author Darik Horn <dajhorn@vanadac.com>
Thu, 10 Mar 2011 14:56:53 +0000 (08:56 -0600)
committer Darik Horn <dajhorn@vanadac.com>
Thu, 10 Mar 2011 14:56:53 +0000 (08:56 -0600)
diff --git a/META b/META

index 59f8b34b8277e6246b7fb8d1b1ccac31911fa7f2..f33eda4ee7f9a09e6e72825d0f93e192e218fa0f 100644 (file)
--- a/META
+++ b/META
@@ -2,5 +2,5 @@ Meta:         1
  Name:         spl
  Branch:       1.0
  Version:      0.6.0
-Release:      rc1
+Release:      rc2
  Release-Tags: relext
author	Darik Horn <dajhorn@vanadac.com>
	Thu, 10 Mar 2011 14:56:53 +0000 (08:56 -0600)
committer	Darik Horn <dajhorn@vanadac.com>
	Thu, 10 Mar 2011 14:56:53 +0000 (08:56 -0600)