Paul Tagliamonte 1dc26148c6 Merge branch 'master' into paultag/ana/if ... Conflicts: hy/contrib/anaphoric.hy		2013-12-26 17:57:29 -05:00
..
__init__.hy	contrib/anaphoric: More anaphoric macros added	2013-12-26 05:57:06 +02:00
anaphoric.hy	Merge branch 'master' into paultag/ana/if	2013-12-26 17:57:29 -05:00