Merge branch 'master' of github.com:leo-clubs/marozi
Merge branch 'master' of github.com:leo-clubs/marozi
Merge branch 'master' of github.com:leifg/marozi
migrate to rails 4.0.0-rc1
rename leo_id to oid
Merge pull request #39 from leifg/rename_leo_id_to_oid

Rename leo_id to oid