<?xml version="1.0" encoding="UTF-8"?>
<commits type="array">
  <commit>
    <parents type="array">
      <parent>
        <id>83123818442a131fd3fa6b22eda1f9baf0f5f17c</id>
      </parent>
    </parents>
    <author>
      <name>Alexander Flatter</name>
      <email>flatter@alexander-flatters-macbook-pro.local</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/507495ad642fccfdfc66dade167ee45838eded74</url>
    <id>507495ad642fccfdfc66dade167ee45838eded74</id>
    <committed-date>2008-06-18T04:52:47-07:00</committed-date>
    <authored-date>2008-06-18T04:52:47-07:00</authored-date>
    <message>dunno</message>
    <tree>126b3ddea2f5aaf9342177ed9960ebd03df749a1</tree>
    <committer>
      <name>Alexander Flatter</name>
      <email>flatter@alexander-flatters-macbook-pro.local</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>77a7b1a4b45c50dd6916802916d54627c1f48a46</id>
      </parent>
      <parent>
        <id>2f7bc7796125c7c43d7fa17b275f7c72fb64ccc7</id>
      </parent>
    </parents>
    <author>
      <name>Alexander Flatter</name>
      <email>flatter@alexander-flatters-macbook-pro.local</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/83123818442a131fd3fa6b22eda1f9baf0f5f17c</url>
    <id>83123818442a131fd3fa6b22eda1f9baf0f5f17c</id>
    <committed-date>2008-05-21T16:26:00-07:00</committed-date>
    <authored-date>2008-05-21T16:26:00-07:00</authored-date>
    <message>Merge branch 'master' of git://github.com/mleung/feather into dm-core</message>
    <tree>bc13e92df36bf35580730d7dabd10eccbc9e35c7</tree>
    <committer>
      <name>Alexander Flatter</name>
      <email>flatter@alexander-flatters-macbook-pro.local</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>f53a518cf8b783139e2ffacad979a8282d346ec8</id>
      </parent>
    </parents>
    <author>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/2f7bc7796125c7c43d7fa17b275f7c72fb64ccc7</url>
    <id>2f7bc7796125c7c43d7fa17b275f7c72fb64ccc7</id>
    <committed-date>2008-05-17T13:13:58-07:00</committed-date>
    <authored-date>2008-05-17T13:13:58-07:00</authored-date>
    <message>Adding in the MIT license file</message>
    <tree>07a86b46f90e86b762453156793af4b36c4f16aa</tree>
    <committer>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>a58a37979ccbe9749b9596c05c97379ca1506873</id>
      </parent>
    </parents>
    <author>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/f53a518cf8b783139e2ffacad979a8282d346ec8</url>
    <id>f53a518cf8b783139e2ffacad979a8282d346ec8</id>
    <committed-date>2008-05-17T11:01:27-07:00</committed-date>
    <authored-date>2008-05-17T11:01:27-07:00</authored-date>
    <message>Added plugin dependencies so you can force load another plugin before yours if it depends on it.</message>
    <tree>776b8c96934d4da4141f5db69dc489db69e871d4</tree>
    <committer>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>a58a37979ccbe9749b9596c05c97379ca1506873</id>
      </parent>
      <parent>
        <id>489e50fdd8374befe46330fa870c48772ae189af</id>
      </parent>
    </parents>
    <author>
      <name>Alexander Flatter</name>
      <email>flatter@alexander-flatters-macbook-pro.local</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/77a7b1a4b45c50dd6916802916d54627c1f48a46</url>
    <id>77a7b1a4b45c50dd6916802916d54627c1f48a46</id>
    <committed-date>2008-05-14T15:34:59-07:00</committed-date>
    <authored-date>2008-05-14T15:34:59-07:00</authored-date>
    <message>Merge branch 'master' of git@github.com:aflatter/feather into dm-core</message>
    <tree>af5f4adf33d9e363498f5dad3b4bcf0601df9404</tree>
    <committer>
      <name>Alexander Flatter</name>
      <email>flatter@alexander-flatters-macbook-pro.local</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>bb957f119a9780471c261d8265dcc5d3ebda3ac8</id>
      </parent>
    </parents>
    <author>
      <name>Alexander Flatter</name>
      <email>flatter@alexander-flatters-macbook-pro.local</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/489e50fdd8374befe46330fa870c48772ae189af</url>
    <id>489e50fdd8374befe46330fa870c48772ae189af</id>
    <committed-date>2008-05-14T11:41:01-07:00</committed-date>
    <authored-date>2008-05-14T11:41:01-07:00</authored-date>
    <message>merb_paginate compatibility with dm 0.3 and dm 0.9</message>
    <tree>06203f64abcce172cea2d667a22bb3f0cf0b4d68</tree>
    <committer>
      <name>Alexander Flatter</name>
      <email>flatter@alexander-flatters-macbook-pro.local</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>17e1dda086509e223c48cac5422dd5236576d8d8</id>
      </parent>
      <parent>
        <id>10e7ee9e5563f298fb13e041c55562638e68ea8d</id>
      </parent>
    </parents>
    <author>
      <name>Alexander Flatter</name>
      <email>flatter@alexander-flatters-macbook-pro.local</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/bb957f119a9780471c261d8265dcc5d3ebda3ac8</url>
    <id>bb957f119a9780471c261d8265dcc5d3ebda3ac8</id>
    <committed-date>2008-05-14T11:38:28-07:00</committed-date>
    <authored-date>2008-05-14T11:38:28-07:00</authored-date>
    <message>Sync with mleung</message>
    <tree>198e705f03824230114244cb095d43744143f510</tree>
    <committer>
      <name>Alexander Flatter</name>
      <email>flatter@alexander-flatters-macbook-pro.local</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>0d5adc9615d8ad93e5972411da9a7f06bfdf2be5</id>
      </parent>
    </parents>
    <author>
      <name>Alexander Flatter</name>
      <email>flatter@alexander-flatters-macbook-pro.local</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/17e1dda086509e223c48cac5422dd5236576d8d8</url>
    <id>17e1dda086509e223c48cac5422dd5236576d8d8</id>
    <committed-date>2008-05-14T09:10:04-07:00</committed-date>
    <authored-date>2008-05-14T09:10:04-07:00</authored-date>
    <message>Seems to be compatible to current datamapper trunk</message>
    <tree>53a211ca96004ca4ac8b9f34e3a5aeec1c1b9139</tree>
    <committer>
      <name>Alexander Flatter</name>
      <email>flatter@alexander-flatters-macbook-pro.local</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>10e7ee9e5563f298fb13e041c55562638e68ea8d</id>
      </parent>
    </parents>
    <author>
      <name>Grant Hollingworth</name>
      <email>grant@antiflux.org</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/a58a37979ccbe9749b9596c05c97379ca1506873</url>
    <id>a58a37979ccbe9749b9596c05c97379ca1506873</id>
    <committed-date>2008-05-14T07:04:37-07:00</committed-date>
    <authored-date>2008-05-14T06:41:34-07:00</authored-date>
    <message>ignore other arguments to Article.all</message>
    <tree>ebb9ba6729645bed829bcc5d8b94655d5c8f6517</tree>
    <committer>
      <name>Grant Hollingworth</name>
      <email>grant@antiflux.org</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>f6d9ec68969222dcd1f3a3676964212e24d49a44</id>
      </parent>
      <parent>
        <id>2492f354374f85e4b9b10697324a5d996315a94b</id>
      </parent>
    </parents>
    <author>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/10e7ee9e5563f298fb13e041c55562638e68ea8d</url>
    <id>10e7ee9e5563f298fb13e041c55562638e68ea8d</id>
    <committed-date>2008-05-09T17:48:44-07:00</committed-date>
    <authored-date>2008-05-09T17:48:44-07:00</authored-date>
    <message>Merge branch 'master' of git@github.com:mleung/feather</message>
    <tree>a6a2cb2ca98d3ffe2cb309cd179be2340067b896</tree>
    <committer>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>938bcd73f741f31bcd93ce1dcd7674df9c1c8138</id>
      </parent>
    </parents>
    <author>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/f6d9ec68969222dcd1f3a3676964212e24d49a44</url>
    <id>f6d9ec68969222dcd1f3a3676964212e24d49a44</id>
    <committed-date>2008-05-09T17:48:20-07:00</committed-date>
    <authored-date>2008-05-09T17:48:20-07:00</authored-date>
    <message>Froze merb_paginate and dependencies in the project</message>
    <tree>2bf0dadd9db768ad755017bc0703f663adb989cf</tree>
    <committer>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>24aabd5c21267f6a92b53901f1d8c4ec8e4dfa40</id>
      </parent>
    </parents>
    <author>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/2492f354374f85e4b9b10697324a5d996315a94b</url>
    <id>2492f354374f85e4b9b10697324a5d996315a94b</id>
    <committed-date>2008-05-09T17:35:28-07:00</committed-date>
    <authored-date>2008-05-09T17:35:28-07:00</authored-date>
    <message>limited the archive list to 20 entries, added a &quot;View all&quot; link that shows the rest using javascript</message>
    <tree>3dfd8cfb9dc56ff378cb2c70d2b7ed120317a290</tree>
    <committer>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>0616a12c045c0f1c8f180cd32f7034def22382b9</id>
      </parent>
      <parent>
        <id>938bcd73f741f31bcd93ce1dcd7674df9c1c8138</id>
      </parent>
    </parents>
    <author>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/24aabd5c21267f6a92b53901f1d8c4ec8e4dfa40</url>
    <id>24aabd5c21267f6a92b53901f1d8c4ec8e4dfa40</id>
    <committed-date>2008-05-09T16:53:24-07:00</committed-date>
    <authored-date>2008-05-09T16:53:24-07:00</authored-date>
    <message>Merge branch 'master' of git@github.com:mleung/feather</message>
    <tree>8b8492a80f1e1622f718f3c9d4f83875ce7e3c54</tree>
    <committer>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>228a89ffe7379b2760b563a92bc70394fd013369</id>
      </parent>
    </parents>
    <author>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/938bcd73f741f31bcd93ce1dcd7674df9c1c8138</url>
    <id>938bcd73f741f31bcd93ce1dcd7674df9c1c8138</id>
    <committed-date>2008-05-09T12:36:05-07:00</committed-date>
    <authored-date>2008-05-09T12:36:05-07:00</authored-date>
    <message>Made new super sweet powered by merb img link to merbivore.com</message>
    <tree>1ace84c077f7f28eea335c72fa982a09531badc4</tree>
    <committer>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>98a3dcfaba78d7ca50080da8b15e6658ba492a44</id>
      </parent>
    </parents>
    <author>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/228a89ffe7379b2760b563a92bc70394fd013369</url>
    <id>228a89ffe7379b2760b563a92bc70394fd013369</id>
    <committed-date>2008-05-09T12:29:19-07:00</committed-date>
    <authored-date>2008-05-09T12:29:19-07:00</authored-date>
    <message>Change footer styling, and added in the sweet powered by merb img.</message>
    <tree>921cfa8516b2c727a9ce5094af80bde62fd04bf7</tree>
    <committer>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>569fde164ef964c8c6a97ae0a8995f7fcf694c93</id>
      </parent>
    </parents>
    <author>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/98a3dcfaba78d7ca50080da8b15e6658ba492a44</url>
    <id>98a3dcfaba78d7ca50080da8b15e6658ba492a44</id>
    <committed-date>2008-05-09T01:26:45-07:00</committed-date>
    <authored-date>2008-05-09T01:26:45-07:00</authored-date>
    <message>Waxed the 'change your theme' link on the dashboard, as we don't have themes.</message>
    <tree>a0708b65ddb150c696cfe461620cb9032f0d7d49</tree>
    <committer>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>9e03ba89cded176d50730b81852be3bc6312105a</id>
      </parent>
    </parents>
    <author>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/569fde164ef964c8c6a97ae0a8995f7fcf694c93</url>
    <id>569fde164ef964c8c6a97ae0a8995f7fcf694c93</id>
    <committed-date>2008-05-08T19:05:54-07:00</committed-date>
    <authored-date>2008-05-08T19:05:54-07:00</authored-date>
    <message>Changed expire_article in the CacheHelper to use the published_at date instead of the permalink when expiring.</message>
    <tree>207cd60d587ca50d315d2feba20ece8d694cc6f7</tree>
    <committer>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>b69fe94eacdd644cfdd6f84fd06454382d6942de</id>
      </parent>
    </parents>
    <author>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/9e03ba89cded176d50730b81852be3bc6312105a</url>
    <id>9e03ba89cded176d50730b81852be3bc6312105a</id>
    <committed-date>2008-05-08T01:40:33-07:00</committed-date>
    <authored-date>2008-05-08T01:40:33-07:00</authored-date>
    <message>Got pagination in for articles, and changed around where action links go.</message>
    <tree>49efff923347709879c5a5e167d33c140230e04e</tree>
    <committer>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>9b379460217a87c8b0f08ea4a0402d3a0262e50c</id>
      </parent>
      <parent>
        <id>b69fe94eacdd644cfdd6f84fd06454382d6942de</id>
      </parent>
    </parents>
    <author>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/0616a12c045c0f1c8f180cd32f7034def22382b9</url>
    <id>0616a12c045c0f1c8f180cd32f7034def22382b9</id>
    <committed-date>2008-05-08T01:18:15-07:00</committed-date>
    <authored-date>2008-05-08T01:18:15-07:00</authored-date>
    <message>Merge branch 'master' of git@github.com:mleung/feather</message>
    <tree>e506e0949f4c8e35d9fd44f355e7ca1d01403c07</tree>
    <committer>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>b46b63f674086ffc47484e8d72cc21096411a3b3</id>
      </parent>
    </parents>
    <author>
      <name>jake</name>
      <email>jake@dropio.com</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/b69fe94eacdd644cfdd6f84fd06454382d6942de</url>
    <id>b69fe94eacdd644cfdd6f84fd06454382d6942de</id>
    <committed-date>2008-05-05T14:07:42-07:00</committed-date>
    <authored-date>2008-05-05T14:07:42-07:00</authored-date>
    <message>Fixed the messaging and ensured that your permalink starts with a slash'</message>
    <tree>871fa34033abb0a6f94c9021ac3c747f66c60362</tree>
    <committer>
      <name>jake</name>
      <email>jake@dropio.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>e6049ec41c7068fdf3bdb670d7325db9e2bafeca</id>
      </parent>
    </parents>
    <author>
      <name>jake</name>
      <email>jake@dropio.com</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/b46b63f674086ffc47484e8d72cc21096411a3b3</url>
    <id>b46b63f674086ffc47484e8d72cc21096411a3b3</id>
    <committed-date>2008-05-05T13:51:34-07:00</committed-date>
    <authored-date>2008-05-05T13:51:34-07:00</authored-date>
    <message>Modified js.</message>
    <tree>037df09575bc867868e37047c5bac8b8e5acb607</tree>
    <committer>
      <name>jake</name>
      <email>jake@dropio.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>5ee0e647b46d4788ea34d201d297f96512cb401e</id>
      </parent>
    </parents>
    <author>
      <name>jake</name>
      <email>jake@dropio.com</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/e6049ec41c7068fdf3bdb670d7325db9e2bafeca</url>
    <id>e6049ec41c7068fdf3bdb670d7325db9e2bafeca</id>
    <committed-date>2008-05-05T13:39:39-07:00</committed-date>
    <authored-date>2008-05-05T13:39:39-07:00</authored-date>
    <message>Permalink formats</message>
    <tree>62ff6239c18bc348879527b5c772d36fb742c71c</tree>
    <committer>
      <name>jake</name>
      <email>jake@dropio.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>19632b010024424bd365b6e5cd66eb2548f838f4</id>
      </parent>
    </parents>
    <author>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/9b379460217a87c8b0f08ea4a0402d3a0262e50c</url>
    <id>9b379460217a87c8b0f08ea4a0402d3a0262e50c</id>
    <committed-date>2008-05-02T16:05:37-07:00</committed-date>
    <authored-date>2008-05-02T16:05:37-07:00</authored-date>
    <message>making sure plugins always load in the same order, to try to reduce issues</message>
    <tree>aa5330bf4ade65b23d812706dc7fc0638910bdbd</tree>
    <committer>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d8c49a4744a6990af6581ff2b7814c9f1ca2a277</id>
      </parent>
    </parents>
    <author>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/5ee0e647b46d4788ea34d201d297f96512cb401e</url>
    <id>5ee0e647b46d4788ea34d201d297f96512cb401e</id>
    <committed-date>2008-05-02T00:55:18-07:00</committed-date>
    <authored-date>2008-05-02T00:55:18-07:00</authored-date>
    <message>Changed before_create for permalink back to before_save.</message>
    <tree>db62e803dac81912d63f450d856cd9692586440a</tree>
    <committer>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>0d5adc9615d8ad93e5972411da9a7f06bfdf2be5</id>
      </parent>
    </parents>
    <author>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/d8c49a4744a6990af6581ff2b7814c9f1ca2a277</url>
    <id>d8c49a4744a6990af6581ff2b7814c9f1ca2a277</id>
    <committed-date>2008-05-01T22:09:25-07:00</committed-date>
    <authored-date>2008-05-01T22:09:25-07:00</authored-date>
    <message>Changed up the way permalinks were being saved. Instead of using before_save it uses before_create now. Makes infinitely more sense to not change the link when the title gets changed. It is a Perma link.</message>
    <tree>671a6ce8ada0e72e52af6e336b6557887e740352</tree>
    <committer>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>414c66ea10087a82495ac06ca68c8150a128196f</id>
      </parent>
    </parents>
    <author>
      <name>Michael Bleigh</name>
      <email>michael@intridea.com</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/0d5adc9615d8ad93e5972411da9a7f06bfdf2be5</url>
    <id>0d5adc9615d8ad93e5972411da9a7f06bfdf2be5</id>
    <committed-date>2008-04-26T20:55:04-07:00</committed-date>
    <authored-date>2008-04-26T20:55:04-07:00</authored-date>
    <message>Added some basic styling to admin tables and fixed XHTML validation errors in admin area with exception of method=&quot;delete&quot; attributes on links.</message>
    <tree>db62e803dac81912d63f450d856cd9692586440a</tree>
    <committer>
      <name>Michael Bleigh</name>
      <email>michael@intridea.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>fb862c6c9e629722e8e3d5b9ed246d573aa6cba0</id>
      </parent>
      <parent>
        <id>19632b010024424bd365b6e5cd66eb2548f838f4</id>
      </parent>
    </parents>
    <author>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/414c66ea10087a82495ac06ca68c8150a128196f</url>
    <id>414c66ea10087a82495ac06ca68c8150a128196f</id>
    <committed-date>2008-04-26T02:52:04-07:00</committed-date>
    <authored-date>2008-04-26T02:52:04-07:00</authored-date>
    <message>Merge branch 'master' of git@github.com:mleung/feather

Conflicts:

	app/controllers/admin/plugins.rb</message>
    <tree>b1fc7ed4728e466ec00015c4025862316e394cb4</tree>
    <committer>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>495a26eae8d71aedc4cfd64631f6c4c8187c80a8</id>
      </parent>
    </parents>
    <author>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/fb862c6c9e629722e8e3d5b9ed246d573aa6cba0</url>
    <id>fb862c6c9e629722e8e3d5b9ed246d573aa6cba0</id>
    <committed-date>2008-04-26T02:49:24-07:00</committed-date>
    <authored-date>2008-04-26T02:49:24-07:00</authored-date>
    <message>Light refactoring in the plugins controller. We had:
(params[:active] == &quot;true&quot; ? true : false)

Changed that to params[:active] == &quot;true&quot; as that evaluates to true
or false anyway.</message>
    <tree>eca2bcf103ea573b88c4d6baddcaff26d550b608</tree>
    <committer>
      <name>Michael Leung</name>
      <email>blamemike@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>ff10a5ba6eacaa4a208b5b9c4f8341a4b9ff23be</id>
      </parent>
    </parents>
    <author>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/19632b010024424bd365b6e5cd66eb2548f838f4</url>
    <id>19632b010024424bd365b6e5cd66eb2548f838f4</id>
    <committed-date>2008-04-25T17:22:33-07:00</committed-date>
    <authored-date>2008-04-25T17:22:33-07:00</authored-date>
    <message>this tidies up various bits of the feather core code, and tries to employ a few common usage patterns across the codebase; also adds a few new event hooks, and gets all the current specs working, as well as adding a few new ones to kickstart the spec writing process</message>
    <tree>6368dfe27f4420abf4ddad32f8b7d8201fb2af32</tree>
    <committer>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>cf61727b6e78b7a06bbf4061991375196c45e19b</id>
      </parent>
    </parents>
    <author>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </author>
    <url>http://github.com/aflatter/feather/commit/ff10a5ba6eacaa4a208b5b9c4f8341a4b9ff23be</url>
    <id>ff10a5ba6eacaa4a208b5b9c4f8341a4b9ff23be</id>
    <committed-date>2008-04-21T14:23:26-07:00</committed-date>
    <authored-date>2008-04-21T14:23:26-07:00</authored-date>
    <message>added a couple of new view hooks, allowing content to be added before the first article in the article index, and after the last article (the context of the first/last article is passed to the view)</message>
    <tree>84ec2e91837aab2556faea40da55f0ae7fa961a4</tree>
    <committer>
      <name>El Draper</name>
      <email>el@eldiablo.co.uk</email>
    </committer>
  </commit>
</commits>
