[4.0] 3453924 Merge branch '4.0' of git.varnish-cache.org:varnish-cache into 4.0

[Lasse Karstensen]

commit 3453924f357a86ad8173c26b932a099cd7e375e5
Merge: 24ac2e1 0a39f22
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date:   Tue Apr 1 15:09:37 2014 +0200

    Merge branch '4.0' of git.varnish-cache.org:varnish-cache into 4.0
    
    Conflicts:
    	configure.ac
    	doc/sphinx/reference/vcl.rst

diff --cc doc/sphinx/reference/vcl.rst
index 1268920,a4b6f7b..ca1ac48
--- a/doc/sphinx/reference/vcl.rst
+++ b/doc/sphinx/reference/vcl.rst
@@@ -54,14 -67,11 +54,14 @@@ The following operators are available i
  Conditionals
  ------------
  
 -VCL has *if* statements.
 +VCL has *if* and *else* statements. Nested logic can be implemented
- with the *elseif* statement. (*elsif*/*elif*/*else if* is equivalent.)
++with the *elseif* statement. (*elsif*/*elif*/*else if* are equivalent.)
  
 +Note that are no loops or iterators of any kind in VCL.
  
 -Strings, booleans, time, duration and ints
 -------------------------------------------
 +
 +Strings, booleans, time, duration and integers
 +----------------------------------------------
  
  These are the data types in Varnish. You can *set* or *unset* these.