pdf
Merge branch 'master' of github.com:hisakonog/FieldDB

Conflicts:
	docs/CAML/caml2012.pdf
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB

pulled from upstream