diff --git a/[refs] b/[refs] index 3782bbb9874a..5d188bdde2d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 508862e493f1107d17fa5a0015084b1773ffc41e +refs/heads/master: cd52d1ee9a92587b242d946a2300a3245d3b885a diff --git a/trunk/Makefile b/trunk/Makefile index c041a4305cd2..8560b79268ba 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 -SUBLEVEL = 14 -EXTRAVERSION = +SUBLEVEL = 15 +EXTRAVERSION =-rc1 NAME=Affluent Albatross # *DOCUMENTATION*