Merge branch 'fantempplugin' into experimental
authorthedoc <thedoc@atom.(none)>
Fri, 11 Dec 2009 12:24:50 +0000 (13:24 +0100)
committerthedoc <thedoc@atom.(none)>
Fri, 11 Dec 2009 12:24:50 +0000 (13:24 +0100)

Trivial merge