remove merge cruft master
authorIvan Kohler <ivan@freeside.biz>
Wed, 3 Jul 2013 00:21:54 +0000 (17:21 -0700)
committerIvan Kohler <ivan@freeside.biz>
Wed, 3 Jul 2013 00:21:54 +0000 (17:21 -0700)
commitb79b9af7c5e00611e45716becebef94aeb382a48
tree0775246ff22e1a5a4129294ef38be51d7d237a25
parent250ee4d7c29d6814fcbf0d38bcec30d6a099ccb1
remove merge cruft
Changes