Paul Tagliamonte ec593154fe Merge branch 'master' into pr/637
Conflicts:
	hy/core/language.hy
2014-11-15 07:58:56 -05:00
..
2014-01-25 21:01:16 +02:00
2014-09-08 16:57:52 +02:00
2013-03-12 22:53:45 -04:00
2014-09-06 08:49:05 -04:00
2014-01-25 21:01:16 +02:00
2013-03-12 22:53:45 -04:00
2014-05-05 23:47:14 +05:30