Björn Weström e550ef9e25 Merge branch 'pr/2'
Conflicts:
	.gitignore
	dist/mermaid.full.min.js
	dist/mermaid.slim.min.js
2014-12-14 22:30:42 +01:00
..
2014-12-14 22:30:42 +01:00
2014-12-14 22:18:16 +01:00
2014-12-14 22:30:42 +01:00
2014-12-14 22:18:16 +01:00