diff --git a/[refs] b/[refs] index edec7077a5cd..3e46c5f9edad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01da5fd83d6b2c5e36b77539f6cbdd8f49849225 +refs/heads/master: 60d4684068ff1eec78f55b5888d0bd2d4cca1520 diff --git a/trunk/Makefile b/trunk/Makefile index 8406d02c6385..33559b566449 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 18 -EXTRAVERSION = -rc4 +EXTRAVERSION = -rc5 NAME=Crazed Snow-Weasel # *DOCUMENTATION*