willium/Journal — pull request #9 by willium (2012-08-16 18:33:56+00:00)
Title: Up to date

keep master up to date