Merge branch 'master' of git://github.com/bergie/hallo

Conflicts: src/plugins/annotate.coffee
sequoiar · Mar 29, 2012 · 3d92e36 · 3d92e36
2 parents 9a9a788 + f86212c
commit 3d92e36
Show file tree

Hide file tree

Showing 5 changed files with 543 additions and 453 deletions.
diff --git a/examples/hallo-min.js b/examples/hallo-min.js