git.shadowcat.co.uk Git - p5sagit/p5-mst-13.2.git/commit

author	Rafael Garcia-Suarez <rgs@consttype.org>
	Tue, 4 May 2010 13:02:08 +0000 (15:02 +0200)
committer	Rafael Garcia-Suarez <rgs@consttype.org>
	Tue, 4 May 2010 13:02:08 +0000 (15:02 +0200)
commit	99782e35be86d92df5daa0659d4cb2351d4a36b9
tree	6c194c8e6029d1c5a03d170b8c2b2ec9fa8465d6	tree \| snapshot
parent	4e2ac26421efaa66f511dc5457604998dbcaa1da	commit \| diff
parent	7ce092845b50544ac127e66e60d73a2f7b707464	commit \| diff

Merge remote branch 'zefram/zefram/reliable_exception' into blead

Conflicts:
pp_ctl.c

Unnamed repository; edit this file to name it for gitweb.