Merge branch 'master' into rss_download
authorAlexis Laferrière <alexis.laf@xymus.net>
Mon, 15 Dec 2014 15:07:15 +0000 (10:07 -0500)
committerAlexis Laferrière <alexis.laf@xymus.net>
Mon, 15 Dec 2014 15:07:15 +0000 (10:07 -0500)

Trivial merge