Tuomas Tynkkynen e2c6740c37 Merge commit 'adaee73' from staging into master ... This one was already merged into release-16.09, so let's not have the stable branch is ahead of master and confuse things. In addition to that, currently we have an odd situation that master has less things actually finished building than in staging. Conflicts: pkgs/data/documentation/man-pages/default.nix		2016-09-03 01:02:51 +03:00
..
2.6	Revert "Python 2.6: add less"	2016-09-01 18:58:14 +02:00
2.7	Revert "Python 2.7: add less"	2016-09-01 18:58:09 +02:00
3.3	fix eval after 0c3b1112af	2016-09-01 13:05:45 +02:00
3.4	fix eval after 0c3b1112af	2016-09-01 13:05:45 +02:00
3.5	python-3.5: Drop dependency on Berkeley DB	2016-09-01 18:57:43 +02:00
3.6	Revert "Python 3.5: add less"	2016-09-01 12:54:46 +02:00
docs