JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
fixed conflict
authorJason Woofenden <jason183@herkamire.com>
Tue, 5 Jun 2007 08:40:20 +0000 (04:40 -0400)
committerJason Woofenden <jason183@herkamire.com>
Tue, 5 Jun 2007 08:40:20 +0000 (04:40 -0400)
commit030f09ab36a49e16a65163e8a537a7ccdb3061e4
tree46ef12213a2c7094d98a19a23429bd142c0abe06
parent21c47e88810e97fe5b727c9c2689f64533bf6452
parentdabdfec87e89ad579cf543608ad118f30981a1c5
fixed conflict
format.php
metaform.php
metaform/template.html
metaform/template.php