Merge branch '0.12.x-stable'
commit055b9ae15ab7612edca1c36ad18c467acec62e75
authorEric Wong <e@80x24.org>
Mon, 14 Dec 2015 09:02:04 +0000 (14 09:02 +0000)
committerEric Wong <e@80x24.org>
Mon, 14 Dec 2015 09:02:04 +0000 (14 09:02 +0000)
tree5361b5ed0d9ac482814acc9bcbb0c52b1911edae
parent7bed564d979ce7eceac9cd382be5c993cf0acfc5
parentcbd58d1773cc19c20dca507831527a1742df4291
Merge branch '0.12.x-stable'

* 0.12.x-stable:
  Rakefile: add Atom feed to website