Merge branch 'master' into develop
Add spec file to EXTRA_DIST
add CONFIGURE_OPTS
add docdir entries
don't bother running an editor during merge-from
error if missing branch name for merge-from and merge-to
report error if a prefix is not found
add unused xmlIsReserved() function
add symlink for oxtradoc in bindir
incorporate yang/bin/outline2xml changes upto r3779 (Oct 2012)
use DESTDIR
add "{{plain:" and "{{quote:" modes; like digress, but simpler
error for missing -m mode
print branch name during checkin
fix json docs
add docs for --show-select and --show-variable
new command line options: --show-select and --show-variable
fix for ".01"; floating point numbers don't need a leading '0'
Build file for travis-ci.org
add 'make install'