Merge remote-tracking branch 'refs/remotes/tsyesika/394-fuzzy-timestamp'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 13 Apr 2013 16:42:34 +0000 (11:42 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 13 Apr 2013 16:42:34 +0000 (11:42 -0500)

Trivial merge