312 commits

Author	SHA1	Message	Date
adam j hartz	f6bd27252b	Merge branch 'master' into pipe	2016-06-13 23:51:58 -04:00
adam j hartz	a73f614992	changelog	2016-06-13 23:49:48 -04:00
Morten Enemark Lund	9ce59a8795	Add changelog entry	2016-06-13 16:32:27 +02:00
adam j hartz	213768a3c9	Merge pull request #1216 from pgoelz/master ... Do not throw an exception on 'completer list' if a completer has no docstring	2016-06-12 18:46:35 -04:00
Paul Goelz	94abe59a5a	Add changelog.	2016-06-13 00:37:14 +02:00
Morten Enemark Lund	af50d8c2ec	Added change log entry	2016-06-12 23:32:57 +02:00
Anthony Scopatz	3aa3a21eef	Merge branch 'master' into rmbash	2016-06-11 22:47:16 -04:00
Anthony Scopatz	0ee3c98c05	bash removal	2016-06-11 22:46:14 -04:00
Anthony Scopatz	b25b057b28	Merge pull request #1210 from cryzed/clean-up-premain ... Clean up argument parsing in premain by removing undo_args hack	2016-06-11 21:29:52 -04:00
cryzed	433822d7fa	Add changelog news file	2016-06-12 03:18:14 +02:00
adam j hartz	fdc73acfa7	merge from master	2016-06-11 21:08:32 -04:00
Anthony Scopatz	8a92da66b1	some prep movements	2016-06-11 16:11:26 -04:00