Merge remote-tracking branch 'processone/master' into xep-0198

Conflicts:
	doc/guide.tex
	src/ejabberd_c2s.erl

1 files changed, 18 insertions, 10 deletions

diff --git a/configure b/configure
index 4114b2e69..6f62dec79 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for ejabberd community.
+# Generated by GNU Autoconf 2.67 for ejabberd community 13.12-119-g47a39ce.
 #
 # Report bugs to <ejabberd@process-one.net>.
 #
@@ -552,8 +552,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ejabberd'
 PACKAGE_TARNAME='ejabberd'
-PACKAGE_VERSION='community'
-PACKAGE_STRING='ejabberd community'
+PACKAGE_VERSION='community 13.12-119-g47a39ce'
+PACKAGE_STRING='ejabberd community 13.12-119-g47a39ce'
 PACKAGE_BUGREPORT='ejabberd@process-one.net'
 PACKAGE_URL=''
 
@@ -1222,7 +1222,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ejabberd community to adapt to many kinds of systems.
+\`configure' configures ejabberd community 13.12-119-g47a39ce to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1283,7 +1283,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ejabberd community:";;
+     short | recursive ) echo "Configuration of ejabberd community 13.12-119-g47a39ce:";;
    esac
   cat <<\_ACEOF
 
@@ -1407,7 +1407,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ejabberd configure community
+ejabberd configure community 13.12-119-g47a39ce
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1466,7 +1466,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ejabberd $as_me community, which was
+It was created by ejabberd $as_me community 13.12-119-g47a39ce, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2480,7 +2480,7 @@ if test "${enable_erlang_version_check+set}" = set; then :
   enableval=$enable_erlang_version_check;
 fi
 
-	case "$enable_erlang_version_check" in
+case "$enable_erlang_version_check" in
 	yes|'')
 				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang/OTP version" >&5
 $as_echo_n "checking Erlang/OTP version... " >&6; }
@@ -2526,6 +2526,10 @@ parse(Version) ->
 
 less_or_equal([], []) ->
     true;
+less_or_equal([], _Any) ->
+    true;
+less_or_equal(_Any, []) ->
+    false;
 less_or_equal([Left| Rl], [Right| Rr]) ->
     case {Left < Right, Left == Right} of
         {true, _}  ->
@@ -2608,6 +2612,10 @@ parse(Version) ->
 
 less_or_equal([], []) ->
     true;
+less_or_equal([], _Any) ->
+    true;
+less_or_equal(_Any, []) ->
+    false;
 less_or_equal([Left| Rl], [Right| Rr]) ->
     case {Left < Right, Left == Right} of
         {true, _}  ->
@@ -4396,7 +4404,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ejabberd $as_me community, which was
+This file was extended by ejabberd $as_me community 13.12-119-g47a39ce, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4449,7 +4457,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ejabberd config.status community
+ejabberd config.status community 13.12-119-g47a39ce
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"