Made leaf_node_test use uint64_t for tstamp_counter_ to avoid info-destroying conversions.
Fixes whitelist to work in release mode.
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next
Merge tag 'v1.3.1' into v1.3.x

Whoohoo, 1.3.1
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next
Fixes whitelist to work in release mode.
Updating white-list to latest files, code reviewed by @atnnn over the shoulder
Resolving white list conflict -- code reviewed by @atnnn over the shoulder
Changelog for v1.3.2 reviewed by @coffeemug
Merge remote-tracking branch 'origin/sam_ubuntu1210' into next
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next
Fix http white-list
Merge branch 'v1.3.x' into next
Merge code review 156 by @slava
Add expires header to rethinkdb web server
Merge review 148 by @srh @jdoliner
Fixing js docs in reql doc
Fixing divergence between rethinkdb-www
Merge branch 'next' into sam_makefilenoise

Conflicts:
	src/Makefile