Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into truffle-head 
Conflicts:
	core/pom.rb
	core/pom.xml
  • Loading branch information
@chrisseaton
chrisseaton committed Jan 22, 2015
2 parents e22fa40 + 5d71187 commit 52391a5
Show file tree
Hide file tree
Showing 457 changed files with 6,111 additions and 11,449 deletions.