Merge remote-tracking branch 'upstream/master'

David Ostrovsky

2013-04-14 94793ed10acf996a4b3f9f1a8538a1b997436d9f

1
2
<#include "macros.ftl"> 
<@AtomMacro posts=releases posturl="${project.url}/history.html#" />