Site updated at 2014-08-01 03:39:28 UTC
Site updated at 2014-08-01 03:41:58 UTC
actual post2
Merge branch 'master' of https://github.com/andresesfm/andresesfm.github.io into source
Merge branch 'source' of https://github.com/andresesfm/andresesfm.github.io into source

Conflicts:
	source/_posts/2014-07-31-using-objectify-alongside-jdo.md