omake-mode.1.1
Merge branch 'master' of github.com:seanmcl/opam-repository
Merge branch 'master' into omake

Conflicts:
	packages/omake-mode.1.1/opam
	packages/omake-mode.1.1/url