Merge branch 'jflatow-worker'
dialyzer: use no_return() to avoid useless warnings.
dialyzer: fix an ignored return_value warning
dialyzer: update some specs
fix disco-node dependency for disco-master (versions need to match)
Merge branch 'rc-integrate'
Revert "change debian packages to depend on erlang r14a" (Ubuntu doesn't have r14a yet)

This reverts commit 869c6b8c209b4d55fcde28402650231c8e27dfde.

Conflicts:

	pkg/debian/control
change order of -types to make r13b compiler happy
added a test for the map_reader before map_init -case which fails currently
Revert "added a test for the map_reader before map_init -case which fails currently"
(deprecate init functions instead)

This reverts commit 88551bf444b7b358fea8e7eb4475df2c5d87ceeb.
force urls from master to strings
Merge branch 'public' of git://github.com/jflatow/disco into jflatow-public
deprecate {map,reduce}_init
docs: add a link to odisco in the worker document
enhanced release notes for 0.4
added odisco submodule
docs: fix a typo in release notes
Merge branch 'jflatow-public'
Added a reference to Python's standard csv module.
discodb: rename not -> nnot, to please g++