<?xml version="1.0" encoding="UTF-8"?>
<commits type="array">
  <commit>
    <parents type="array">
      <parent>
        <id>55a32e47fc1760e674b6d8ba43a9af2d42be71fc</id>
      </parent>
    </parents>
    <author>
      <name>Rob Kaufman</name>
      <email>rob@notch8.com</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/1d89d4090bd88a8654b00e8a0150ddd8bba42cf9</url>
    <id>1d89d4090bd88a8654b00e8a0150ddd8bba42cf9</id>
    <committed-date>2008-06-04T18:49:55-07:00</committed-date>
    <authored-date>2008-06-04T18:49:55-07:00</authored-date>
    <message>Fixed spec bug</message>
    <tree>567c525ee0f6d404ebfa00983d7f7580edc2f664</tree>
    <committer>
      <name>Rob Kaufman</name>
      <email>rob@notch8.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>13f70c70c62c2cf661bb32ccedfd45e1b1a05242</id>
      </parent>
      <parent>
        <id>92cadb4ad9a1e57a15837d5d97681a7579dbf66b</id>
      </parent>
    </parents>
    <author>
      <name>Rob Kaufman</name>
      <email>rob@notch8.com</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/55a32e47fc1760e674b6d8ba43a9af2d42be71fc</url>
    <id>55a32e47fc1760e674b6d8ba43a9af2d42be71fc</id>
    <committed-date>2008-06-03T09:11:06-07:00</committed-date>
    <authored-date>2008-06-03T09:11:06-07:00</authored-date>
    <message>Merge branch 'master' of git://github.com/jf/feather-plugins into jf/master</message>
    <tree>80e24483447776caf0d6e371426f9d7ffe845de3</tree>
    <committer>
      <name>Rob Kaufman</name>
      <email>rob@notch8.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d19f6b76d7bb4b62d008fde605141afa437110e7</id>
      </parent>
      <parent>
        <id>a9158d8bc703f37ab5c4351453d256f8b47d32df</id>
      </parent>
    </parents>
    <author>
      <name>Rob Kaufman</name>
      <email>rob@notch8.com</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/13f70c70c62c2cf661bb32ccedfd45e1b1a05242</url>
    <id>13f70c70c62c2cf661bb32ccedfd45e1b1a05242</id>
    <committed-date>2008-06-02T16:14:24-07:00</committed-date>
    <authored-date>2008-06-02T16:14:24-07:00</authored-date>
    <message>Merge branch 'master' of git://github.com/eldiablo/feather-plugins into eldiablo/master</message>
    <tree>8fca9e264869b2554148cb38de08eb0ffbd31ab8</tree>
    <committer>
      <name>Rob Kaufman</name>
      <email>rob@notch8.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>ff455f027ce7314202984de0ade24f0d2356229b</id>
      </parent>
    </parents>
    <author>
      <name>Jeffrey 'jf' Lim</name>
      <email>jfs.world@gmail.com</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/92cadb4ad9a1e57a15837d5d97681a7579dbf66b</url>
    <id>92cadb4ad9a1e57a15837d5d97681a7579dbf66b</id>
    <committed-date>2008-06-01T06:10:33-07:00</committed-date>
    <authored-date>2008-06-01T06:10:07-07:00</authored-date>
    <message>update the README to reflect status change in feather-recaptcha</message>
    <tree>d67168971912377aa61dff907629edaf1a20a500</tree>
    <committer>
      <name>Jeffrey 'jf' Lim</name>
      <email>jfs.world@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>ce21651a7fd36b562022be50f1f687a3049e7463</id>
      </parent>
    </parents>
    <author>
      <name>Jeffrey 'jf' Lim</name>
      <email>jfs.world@gmail.com</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/ff455f027ce7314202984de0ade24f0d2356229b</url>
    <id>ff455f027ce7314202984de0ade24f0d2356229b</id>
    <committed-date>2008-06-01T06:02:05-07:00</committed-date>
    <authored-date>2008-06-01T05:57:08-07:00</authored-date>
    <message>fix up helpers as well. feather-recaptcha is now in the working state!!!

Additional feather hook needed in order to hook this in properly (like captcha has to display *WITHIN* the form, and not outside of it?), but otherwise, plugin is now officially in the working state, ready to be used.</message>
    <tree>270a3c2a8d01ac1d5197e59f9ed3e523f562ad31</tree>
    <committer>
      <name>Jeffrey 'jf' Lim</name>
      <email>jfs.world@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>a9158d8bc703f37ab5c4351453d256f8b47d32df</id>
      </parent>
    </parents>
    <author>
      <name>Jeffrey 'jf' Lim</name>
      <email>jfs.world@gmail.com</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/ce21651a7fd36b562022be50f1f687a3049e7463</url>
    <id>ce21651a7fd36b562022be50f1f687a3049e7463</id>
    <committed-date>2008-06-01T05:36:48-07:00</committed-date>
    <authored-date>2008-06-01T05:36:48-07:00</authored-date>
    <message>fix 'Comments' controller trigger not triggering.

(plus rename our own plugin method to be more distinct (and hopefully more intuitive!!!) in order to separate it from what is 'include'-d ('validate_recap'))</message>
    <tree>d0e9aeefaaa00aaefc0cbce7ddc32fb6b16a77ef</tree>
    <committer>
      <name>Jeffrey 'jf' Lim</name>
      <email>jfs.world@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>3c5100324967405425cbccc3746a2108a6b77270</id>
      </parent>
    </parents>
    <author>
      <name>jake</name>
      <email>jake@dropio.com</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/a9158d8bc703f37ab5c4351453d256f8b47d32df</url>
    <id>a9158d8bc703f37ab5c4351453d256f8b47d32df</id>
    <committed-date>2008-05-30T09:40:23-07:00</committed-date>
    <authored-date>2008-05-30T09:40:23-07:00</authored-date>
    <message>README change</message>
    <tree>71382f86319aee8eedbba483eb873aee0ec09547</tree>
    <committer>
      <name>jake</name>
      <email>jake@dropio.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>db7d32e602da201d9e90f46766e31f932067898a</id>
      </parent>
    </parents>
    <author>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/3c5100324967405425cbccc3746a2108a6b77270</url>
    <id>3c5100324967405425cbccc3746a2108a6b77270</id>
    <committed-date>2008-05-27T14:47:44-07:00</committed-date>
    <authored-date>2008-05-27T14:47:44-07:00</authored-date>
    <message>committed the first version of the &quot;repo&quot; plugin, allowing you to host Feather plugins directly from your own site - currently it's just the bare bones (allowing releases to be added), but will be expanded to host the manifest and package files, and will tie in with changes in the core code to allow repositories to be queried from the Feather admin interface, allowing one-click installs of plugins. Also updated README with descriptions of some of the newer plugins</message>
    <tree>14365d4d57f9597a53c57b14574d55d16f97e400</tree>
    <committer>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>b08d6c0f40a3aaceb14a3f9bd9d8c0738a6192d2</id>
      </parent>
    </parents>
    <author>
      <name>Rob Kaufman</name>
      <email>rob@notch8.com</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/d19f6b76d7bb4b62d008fde605141afa437110e7</url>
    <id>d19f6b76d7bb4b62d008fde605141afa437110e7</id>
    <committed-date>2008-05-23T15:00:20-07:00</committed-date>
    <authored-date>2008-05-23T15:00:20-07:00</authored-date>
    <message>Added feather-mollom to the readme</message>
    <tree>18b2d2a882313b7c520fc6245637bc1b2e35a5ff</tree>
    <committer>
      <name>Rob Kaufman</name>
      <email>rob@notch8.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>298300ea5c9df75eee27c08e64cf648391fd6042</id>
      </parent>
    </parents>
    <author>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/db7d32e602da201d9e90f46766e31f932067898a</url>
    <id>db7d32e602da201d9e90f46766e31f932067898a</id>
    <committed-date>2008-05-23T13:36:11-07:00</committed-date>
    <authored-date>2008-05-23T13:36:11-07:00</authored-date>
    <message>Changed Jake's search plugin to have a 20px top margin like other sidebar group items</message>
    <tree>508551b6491556c6b0cbcddc5f40407b9ef24b31</tree>
    <committer>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>cb18148047cc2f10daf39a684329d0469d4a612a</id>
      </parent>
    </parents>
    <author>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/298300ea5c9df75eee27c08e64cf648391fd6042</url>
    <id>298300ea5c9df75eee27c08e64cf648391fd6042</id>
    <committed-date>2008-05-22T10:01:54-07:00</committed-date>
    <authored-date>2008-05-22T10:01:54-07:00</authored-date>
    <message>Adding a top margin to Jake's search bar div in feather-search</message>
    <tree>b8403583b94d384bb3b4c7649863715239e9d3a7</tree>
    <committer>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>5618a71ab6c02cfb3dc965cd0d6f888d0318a4b2</id>
      </parent>
    </parents>
    <author>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/cb18148047cc2f10daf39a684329d0469d4a612a</url>
    <id>cb18148047cc2f10daf39a684329d0469d4a612a</id>
    <committed-date>2008-05-22T09:00:52-07:00</committed-date>
    <authored-date>2008-05-22T09:00:52-07:00</authored-date>
    <message>taking out CodeRay support for the minute as there is a module named Plugin which clashes with our model class Plugin, and so until we fix that we need to ensure the rest of the formatters plugin still works as expected</message>
    <tree>9cf3ebe0f23f09899e0306f993a1af450a72f3a4</tree>
    <committer>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>da62df9f1b93f93e9514d6d2257cc61009e43935</id>
      </parent>
    </parents>
    <author>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/5618a71ab6c02cfb3dc965cd0d6f888d0318a4b2</url>
    <id>5618a71ab6c02cfb3dc965cd0d6f888d0318a4b2</id>
    <committed-date>2008-05-22T05:09:34-07:00</committed-date>
    <authored-date>2008-05-22T05:09:34-07:00</authored-date>
    <message>fixing the gemspec using the spec that gets generated when you do &quot;gem install coderay&quot; - there was a few problems with the original one</message>
    <tree>f2f2596ae7e57ac7ae8aafc9387b09929f3d798c</tree>
    <committer>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>934ac2db73e01a714f39d21bc183b7df7af10d00</id>
      </parent>
    </parents>
    <author>
      <name>Rob Kaufman</name>
      <email>rob@notch8.com</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/b08d6c0f40a3aaceb14a3f9bd9d8c0738a6192d2</url>
    <id>b08d6c0f40a3aaceb14a3f9bd9d8c0738a6192d2</id>
    <committed-date>2008-05-21T17:31:10-07:00</committed-date>
    <authored-date>2008-05-21T17:31:10-07:00</authored-date>
    <message>Fixed mollom connectivity</message>
    <tree>b5713ad09dab86da268e23334294196dccb64658</tree>
    <committer>
      <name>Rob Kaufman</name>
      <email>rob@notch8.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>e4a3127c02716d87f9ff108537177cab0637595c</id>
      </parent>
    </parents>
    <author>
      <name>Rob Kaufman</name>
      <email>rob@notch8.com</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/934ac2db73e01a714f39d21bc183b7df7af10d00</url>
    <id>934ac2db73e01a714f39d21bc183b7df7af10d00</id>
    <committed-date>2008-05-21T17:08:23-07:00</committed-date>
    <authored-date>2008-05-21T17:08:23-07:00</authored-date>
    <message>Major overhaul of mollom plugin</message>
    <tree>c4be03f2eaabce42b7e4e221aed362b36780bf7a</tree>
    <committer>
      <name>Rob Kaufman</name>
      <email>rob@notch8.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>7f966fb717e2090d606afe6bb99ce1630336806d</id>
      </parent>
      <parent>
        <id>da62df9f1b93f93e9514d6d2257cc61009e43935</id>
      </parent>
    </parents>
    <author>
      <name>Rob Kaufman</name>
      <email>rob@notch8.com</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/e4a3127c02716d87f9ff108537177cab0637595c</url>
    <id>e4a3127c02716d87f9ff108537177cab0637595c</id>
    <committed-date>2008-05-21T15:03:38-07:00</committed-date>
    <authored-date>2008-05-21T15:03:38-07:00</authored-date>
    <message>Merge branch 'master' of git://github.com/eldiablo/feather-plugins into main/master</message>
    <tree>36e18cc924b62eda1fe6555fbad00225452140ad</tree>
    <committer>
      <name>Rob Kaufman</name>
      <email>rob@notch8.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>da64aa9fb3b65bda47630939ef86b69c0fe73950</id>
      </parent>
      <parent>
        <id>a4924c518a72e9979e66b921f2c4bf24eec120f6</id>
      </parent>
    </parents>
    <author>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/da62df9f1b93f93e9514d6d2257cc61009e43935</url>
    <id>da62df9f1b93f93e9514d6d2257cc61009e43935</id>
    <committed-date>2008-05-21T14:48:08-07:00</committed-date>
    <authored-date>2008-05-21T14:48:08-07:00</authored-date>
    <message>Merge branch 'master' of git@github.com:eldiablo/feather-plugins</message>
    <tree>5868f8d9af19e5d7a17fdd99cabc3d5ae816311a</tree>
    <committer>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>24c24de1c0dde7e1eb209903e6bdd32161221f28</id>
      </parent>
      <parent>
        <id>636870228914bfaad5ec6bd8e92300e6a5d1b4aa</id>
      </parent>
    </parents>
    <author>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/da64aa9fb3b65bda47630939ef86b69c0fe73950</url>
    <id>da64aa9fb3b65bda47630939ef86b69c0fe73950</id>
    <committed-date>2008-05-21T14:45:41-07:00</committed-date>
    <authored-date>2008-05-21T14:45:41-07:00</authored-date>
    <message>Merge branch 'master' of git://github.com/sudothinker/feather-plugins into sudothinker/master

Conflicts:

	feather-formatters/init.rb
	feather-formatters/manifest.yml</message>
    <tree>b566c991c2df9295bcf5f4b3b5f86016c9684d6b</tree>
    <committer>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>da174f01614e010c4b3bc439498ff2a85b4479f6</id>
      </parent>
    </parents>
    <author>
      <name>Michael Murray</name>
      <email>mdmurray@gmail.com</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/636870228914bfaad5ec6bd8e92300e6a5d1b4aa</url>
    <id>636870228914bfaad5ec6bd8e92300e6a5d1b4aa</id>
    <committed-date>2008-05-21T12:57:24-07:00</committed-date>
    <authored-date>2008-05-21T12:57:24-07:00</authored-date>
    <message>Adding coderay support to feather-formatters via markdown + coderay formatter, added a stylesheet to color highlight code</message>
    <tree>42b49e9030142eb0e63f0c8f3ff14d076a35b793</tree>
    <committer>
      <name>Michael Murray</name>
      <email>mdmurray@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>4f4c04034feeea082fadd36a46d2fc6e5d819cf4</id>
      </parent>
    </parents>
    <author>
      <name>Michael Murray</name>
      <email>mdmurray@gmail.com</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/da174f01614e010c4b3bc439498ff2a85b4479f6</url>
    <id>da174f01614e010c4b3bc439498ff2a85b4479f6</id>
    <committed-date>2008-05-20T21:23:12-07:00</committed-date>
    <authored-date>2008-05-20T21:23:12-07:00</authored-date>
    <message>Adding coderay support to feather-formatters - conflict with coderay/helpers/plugin.rb? - 'Plugin is not a module'</message>
    <tree>07b930680ba9044127a61f0e629f438efa4ff6f5</tree>
    <committer>
      <name>Michael Murray</name>
      <email>mdmurray@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>9ca6bb19518076eebdcc82f568511316021a3012</id>
      </parent>
    </parents>
    <author>
      <name>jake</name>
      <email>jake@dropio.com</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/a4924c518a72e9979e66b921f2c4bf24eec120f6</url>
    <id>a4924c518a72e9979e66b921f2c4bf24eec120f6</id>
    <committed-date>2008-05-20T14:32:54-07:00</committed-date>
    <authored-date>2008-05-20T14:32:54-07:00</authored-date>
    <message>Fixed to work with FF and Safari</message>
    <tree>51b01cb3df2b36cd0dd0501d15a349080d651981</tree>
    <committer>
      <name>jake</name>
      <email>jake@dropio.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d98c3cac19f17ba73289f4a4c022ee455f1b26c9</id>
      </parent>
      <parent>
        <id>24c24de1c0dde7e1eb209903e6bdd32161221f28</id>
      </parent>
    </parents>
    <author>
      <name>jake</name>
      <email>jake@dropio.com</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/9ca6bb19518076eebdcc82f568511316021a3012</url>
    <id>9ca6bb19518076eebdcc82f568511316021a3012</id>
    <committed-date>2008-05-20T14:25:17-07:00</committed-date>
    <authored-date>2008-05-20T14:25:17-07:00</authored-date>
    <message>Merge branch 'master' of git@github.com:eldiablo/feather-plugins</message>
    <tree>80e275013678fe8e68dc15bcc493ffd0e950dd87</tree>
    <committer>
      <name>jake</name>
      <email>jake@dropio.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>0ae90a168cad668e100564661d9ac2dfbee13a25</id>
      </parent>
    </parents>
    <author>
      <name>jake</name>
      <email>jake@dropio.com</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/d98c3cac19f17ba73289f4a4c022ee455f1b26c9</url>
    <id>d98c3cac19f17ba73289f4a4c022ee455f1b26c9</id>
    <committed-date>2008-05-20T14:25:08-07:00</committed-date>
    <authored-date>2008-05-20T14:25:08-07:00</authored-date>
    <message>Fixed localhost entry</message>
    <tree>730fa9485c4518640897f1fa30b104f708937d18</tree>
    <committer>
      <name>jake</name>
      <email>jake@dropio.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>ddb8188bb35281fd1ab001aaa8c09d4c69d576fa</id>
      </parent>
    </parents>
    <author>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/24c24de1c0dde7e1eb209903e6bdd32161221f28</url>
    <id>24c24de1c0dde7e1eb209903e6bdd32161221f28</id>
    <committed-date>2008-05-20T12:36:36-07:00</committed-date>
    <authored-date>2008-05-20T12:36:36-07:00</authored-date>
    <message>no slash needed after all</message>
    <tree>5a4dd555983458fd5463b189bc8707fc35efefbe</tree>
    <committer>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>616716e6aed257efd792e8ffb9cf6e1df0f2403f</id>
      </parent>
    </parents>
    <author>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/ddb8188bb35281fd1ab001aaa8c09d4c69d576fa</url>
    <id>ddb8188bb35281fd1ab001aaa8c09d4c69d576fa</id>
    <committed-date>2008-05-20T12:30:42-07:00</committed-date>
    <authored-date>2008-05-20T12:30:42-07:00</authored-date>
    <message>this fixes the location for article urls, adding in a missing slash</message>
    <tree>424b6d1f59bee492fdfb1767753e4239b089cff4</tree>
    <committer>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>3e387a15655e6d9ef44fe0a31feea520b5a1f8da</id>
      </parent>
      <parent>
        <id>4f4c04034feeea082fadd36a46d2fc6e5d819cf4</id>
      </parent>
    </parents>
    <author>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/616716e6aed257efd792e8ffb9cf6e1df0f2403f</url>
    <id>616716e6aed257efd792e8ffb9cf6e1df0f2403f</id>
    <committed-date>2008-05-20T12:09:00-07:00</committed-date>
    <authored-date>2008-05-20T12:09:00-07:00</authored-date>
    <message>Merge branch 'master' of git://github.com/sudothinker/feather-plugins into sudothinker/master</message>
    <tree>5a4dd555983458fd5463b189bc8707fc35efefbe</tree>
    <committer>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>86ae2bfdc88337c36c508ebe7f80ba4a585bb821</id>
      </parent>
    </parents>
    <author>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/3e387a15655e6d9ef44fe0a31feea520b5a1f8da</url>
    <id>3e387a15655e6d9ef44fe0a31feea520b5a1f8da</id>
    <committed-date>2008-05-20T11:08:03-07:00</committed-date>
    <authored-date>2008-05-20T11:08:03-07:00</authored-date>
    <message>fixing some merge conflicts added when merging a pull request</message>
    <tree>1ea0d99999a30d29806d799471d0f605d821a2a7</tree>
    <committer>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>400f136da35f4e6fed0044e1265684118cb3ed77</id>
      </parent>
      <parent>
        <id>29654722a21eea2b9d2b65d99c979af384f5f365</id>
      </parent>
    </parents>
    <author>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/86ae2bfdc88337c36c508ebe7f80ba4a585bb821</url>
    <id>86ae2bfdc88337c36c508ebe7f80ba4a585bb821</id>
    <committed-date>2008-05-20T10:26:42-07:00</committed-date>
    <authored-date>2008-05-20T10:26:42-07:00</authored-date>
    <message>tidying up

Merge branch 'feed-validation' of git://github.com/granth/feather-plugins into granth/feed-validation

Conflicts:

	feather-jabber/.DS_Store
	feather-jabber/init.rb
	feather-jabber/lib/comment.rb
	feather-jabber/manifest.yml
	feather-jabber/views/admin/jabber_settings/edit.html.erb
	feather-jabber/views/admin/jabber_settings/show.html.erb</message>
    <tree>197868f24336be42bfe5ebef89a0b26dfcd6b913</tree>
    <committer>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>181a4e38c06e83125f6d77431b5a2190430b052a</id>
      </parent>
    </parents>
    <author>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/400f136da35f4e6fed0044e1265684118cb3ed77</url>
    <id>400f136da35f4e6fed0044e1265684118cb3ed77</id>
    <committed-date>2008-05-20T10:25:26-07:00</committed-date>
    <authored-date>2008-05-20T10:25:26-07:00</authored-date>
    <message>tidying up</message>
    <tree>2ff4bd9f21f662a1760406450fbcce0bc8907ac6</tree>
    <committer>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>5ebaf82dc344861f2e0ac5e931f21e21762b00fa</id>
      </parent>
      <parent>
        <id>0ae90a168cad668e100564661d9ac2dfbee13a25</id>
      </parent>
    </parents>
    <author>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </author>
    <url>http://github.com/notch8/feather-plugins/commit/181a4e38c06e83125f6d77431b5a2190430b052a</url>
    <id>181a4e38c06e83125f6d77431b5a2190430b052a</id>
    <committed-date>2008-05-20T10:08:31-07:00</committed-date>
    <authored-date>2008-05-20T10:08:31-07:00</authored-date>
    <message>Merge branch 'master' of git@github.com:eldiablo/feather-plugins</message>
    <tree>cfc3ad7dcdefa0032041f9743716a4fadd72c36b</tree>
    <committer>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </committer>
  </commit>
</commits>
