From: Karen Etheridge Date: Thu, 13 Jun 2013 21:44:33 +0000 (-0700) Subject: Merge branch 'topic/conflicting_upstream_deps' X-Git-Tag: v1.003000~55 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=399c975b323e0a910a881edeb63c01d3526598fc;p=gitmo%2FMoo.git Merge branch 'topic/conflicting_upstream_deps' We now have conflict tracking! Please keep it up to date when an issue is observed. --- 399c975b323e0a910a881edeb63c01d3526598fc