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)
commit6f1e7dff0f9ee7f56d48d3597d45d581057d6ce7
tree13822b1635170981ee0ab8a3fbbe5d030b3237ee
parent28dcf6be0ee22fedd728fef11ccff484f8a851e8
parent84b36922b357db78b354ea85be700e2dbd15e5d0
Merge branch 'fantempplugin' into experimental