Added a comment+package name to error.en_US.php to avoid having a default package in the ref doc
Fixed bug - jForms - deactivated lists inside a choice item was activated
Update lib/jelix/plugins/auth/ldap/ldap.auth.php

a typo error : property $this->params doesn't exist, it's $this->_params
----------------------
Coquille dans le code : la propriété $this->params n'existe pas, c'est $this->_params
Conflicts:

	lib/jelix/plugins/auth/ldap/ldap.auth.php
Jelix-tests - fix a bug: launching runtests.php with a filename did execute all tests of the module instead of the given file
jforms_query.js: Removed a debug instruction
Fixed tests about the last bug fixed on jforms query/light.
Merge branch 'jelix-1.2.x' into jelix-1.3.x

Conflicts:
	lib/jelix/plugins/auth/ldap/ldap.auth.php
	testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php
	testapp/modules/jelix_tests/tests/jforms.htmlbuilder2.html_cli.php
	testapp/modules/jelix_tests/tests/jforms.htmllightbuilder.html_cli.php
	testapp/modules/jelix_tests/tests/jforms.htmllightbuilder2.html_cli.php
Merge branch 'jelix-1.3.x' into jelix-1.4.x
Fixed bug in jUrl::getCurrentUrl - it should return the URL for the frontend server when the app is behind a proxy

The method doesn't return anymore a full URL with the domain name. A new parameter allow to get the full URL.
Merge branch 'jelix-1.3.x' into jelix-1.4.x

Conflicts:
	lib/jelix/core/jUrl.class.php
New script to bumped versions for a release
Merge branch 'jelix-1.2.x' into jelix-1.3.x
Merge branch 'jelix-1.3.x' into jelix-1.4.x
Build: generate a file containing package name for testapp and fonts, for the nightlybuild script of jelix.org
Merge branch 'jelix-1.2.x' into jelix-1.3.x
Merge branch 'jelix-1.3.x' into jelix-1.4.x
set_new_version.sh should be executable
Release Jelix 1.2.11
Bumped version to 1.2.12pre.SERIAL
Merge branch 'jelix-1.2.x' into jelix-1.3.x

Conflicts:
	lib/jelix/VERSION
	testapp/VERSION