Merge branch 'asf-site'
Conflicts:
content/downloads/downloads.html
Project: http://git-wip-us.apache.org/repos/asf/roller-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller-website/commit/0cda4367
Tree: http://git-wip-us.apache.org/repos/asf/roller-website/tree/0cda4367
Diff: http://git-wip-us.apache.org/repos/asf/roller-website/diff/0cda4367
Branch: refs/heads/master
Commit: 0cda43677a25f7ec1d531a34f6759c3853fc9701
Parents: 5d3c500 34d0f14
Author: Dave Johnson <[email protected]>
Authored: Sun Oct 2 14:39:33 2016 -0400
Committer: Dave Johnson <[email protected]>
Committed: Sun Oct 2 14:39:33 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
