<?xml version="1.0" encoding="UTF-8"?>
<commits type="array">
  <commit>
    <parents type="array">
      <parent>
        <id>977c418593c018006cb06176ff9ab03bf6aac72b</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/0f78d00478262341783ac16779c8993f79014017</url>
    <id>0f78d00478262341783ac16779c8993f79014017</id>
    <committed-date>2008-09-04T16:05:08-07:00</committed-date>
    <authored-date>2008-09-04T16:05:08-07:00</authored-date>
    <message>Added MerbExceptions plugin to facilitate e-mail notification of application exceptions.</message>
    <tree>2b65aae066771bdbddfc158498f4fd8279259c47</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>8a54359a8f617e7dd641a9d29167744158bc588d</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/3df0a70cba3272e497ba4c21c28afb40d0fbbb8c</url>
    <id>3df0a70cba3272e497ba4c21c28afb40d0fbbb8c</id>
    <committed-date>2008-09-01T21:53:48-07:00</committed-date>
    <authored-date>2008-09-01T21:53:48-07:00</authored-date>
    <message>Completed OpenID login/logout functionality. Updated bootstrap task to create an anonymous user.</message>
    <tree>2ef13737f25e478c81c014cc08b4270e7a0ef87e</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>fe22c9d8463cafdd36ca733250f25ea6b1fd7bd2</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/8a54359a8f617e7dd641a9d29167744158bc588d</url>
    <id>8a54359a8f617e7dd641a9d29167744158bc588d</id>
    <committed-date>2008-09-01T13:32:57-07:00</committed-date>
    <authored-date>2008-09-01T13:32:57-07:00</authored-date>
    <message>Added ruby-openid gem to local gem repo</message>
    <tree>ed2d263fba96dced7bd2581f8319464382abceaf</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>859222a73e5b2ce617e7e02fc05e6f8df645bb83</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/fe22c9d8463cafdd36ca733250f25ea6b1fd7bd2</url>
    <id>fe22c9d8463cafdd36ca733250f25ea6b1fd7bd2</id>
    <committed-date>2008-09-01T13:30:53-07:00</committed-date>
    <authored-date>2008-07-08T13:33:11-07:00</authored-date>
    <message>Began fleshing out OpenID support</message>
    <tree>c8315e8df19ce913bf41e6594959b8889424df8d</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>bae28dee20f1977a39d26ca85b83eda041821ae1</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/0c16f42a608fca5c662544fde6cebf3a73d86c19</url>
    <id>0c16f42a608fca5c662544fde6cebf3a73d86c19</id>
    <committed-date>2008-08-27T02:32:06-07:00</committed-date>
    <authored-date>2008-08-27T02:32:06-07:00</authored-date>
    <message>Added MerbHasFlash again because of breakage with existing cookies.</message>
    <tree>f5942f64b32d99b552ea205225310d73c7fc2d62</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>b0a4eeb68aaa5f95fe272285d32b51812ff214f1</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/6c3046f721caf2920be872122510560ae3571b9d</url>
    <id>6c3046f721caf2920be872122510560ae3571b9d</id>
    <committed-date>2008-08-27T01:18:35-07:00</committed-date>
    <authored-date>2008-08-27T01:18:35-07:00</authored-date>
    <message>Updated sample config with admin username and password</message>
    <tree>7d3768165d51dd639ab811eb2d5f6cb14ca2a79f</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>4016cf8ea4e66412bd798ce516972b5b37c4db26</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/b0a4eeb68aaa5f95fe272285d32b51812ff214f1</url>
    <id>b0a4eeb68aaa5f95fe272285d32b51812ff214f1</id>
    <committed-date>2008-08-27T01:08:30-07:00</committed-date>
    <authored-date>2008-08-27T01:08:30-07:00</authored-date>
    <message>Added more gems to the local repo to minimize external dependencies.</message>
    <tree>7bad31124f360a09f70d648219f920366a886a70</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d2f59cef134251c77b4e19b887e5cf557fe95f18</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/3f9628fee457c99d68b3643bd5e241527e53919e</url>
    <id>3f9628fee457c99d68b3643bd5e241527e53919e</id>
    <committed-date>2008-08-27T00:21:41-07:00</committed-date>
    <authored-date>2008-08-27T00:21:41-07:00</authored-date>
    <message>Reverted from merb_helpers 0.9.5 to 0.9.4. I'll undertake the refactoring later.</message>
    <tree>6d7ffd415d44d68979b636306cec290626cec6ea</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>94fc3a48fe59488e06ab6cbdb0b3309f25ddecbe</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/271c7cfb9e5eeeeb58432bc60f351cc82ba27555</url>
    <id>271c7cfb9e5eeeeb58432bc60f351cc82ba27555</id>
    <committed-date>2008-08-26T23:59:33-07:00</committed-date>
    <authored-date>2008-08-26T23:59:33-07:00</authored-date>
    <message>Froze dependencies that don't require compilation. Fixed a few specs.</message>
    <tree>d753876beb17149b519848f1bfeb3fd49d6f5f60</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>59f8edb2c9488bf08e49e5b49aa9473d071ada86</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/94fc3a48fe59488e06ab6cbdb0b3309f25ddecbe</url>
    <id>94fc3a48fe59488e06ab6cbdb0b3309f25ddecbe</id>
    <committed-date>2008-08-26T17:05:31-07:00</committed-date>
    <authored-date>2008-08-26T17:05:31-07:00</authored-date>
    <message>A couple more little changes...</message>
    <tree>a03fa0b2bbec55be81fe9639335802883ab9d01f</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>b7094f68ce251c8bd48a5e6bbca4367d4ece46f2</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/59f8edb2c9488bf08e49e5b49aa9473d071ada86</url>
    <id>59f8edb2c9488bf08e49e5b49aa9473d071ada86</id>
    <committed-date>2008-08-26T15:02:08-07:00</committed-date>
    <authored-date>2008-08-26T15:02:08-07:00</authored-date>
    <message>Ported can_has_fixtures code to dm-sweatshop.</message>
    <tree>bea3ef114da09c61b04332e8748240fbf58d58d4</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>1c5ce6dab907bc0f905ec91e0810a3d263c9ba99</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/e5453ebcb63e4808ab1ebdf38b939dbf809e8f96</url>
    <id>e5453ebcb63e4808ab1ebdf38b939dbf809e8f96</id>
    <committed-date>2008-08-26T02:19:02-07:00</committed-date>
    <authored-date>2008-08-26T02:19:02-07:00</authored-date>
    <message>Updated README to reflect requirement of Edge Merb &amp; DataMapper. Polished up some diffing/spam checking code.</message>
    <tree>e5a75329d47813e39812473a2550988f2a2bb528</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>90ce860ced2c78ab757f563ac7ab532fa55d96c9</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/8247b08e3f68ab506c0431a74259d1a9d39d4180</url>
    <id>8247b08e3f68ab506c0431a74259d1a9d39d4180</id>
    <committed-date>2008-08-25T17:04:23-07:00</committed-date>
    <authored-date>2008-08-25T17:04:23-07:00</authored-date>
    <message>Wiki is functional on DM0.9. Many specs are still failing.</message>
    <tree>c20de4442ce7fb76b546c5176677b3476b600c29</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>8afabf024cbcb90b18d16ba4b02ffb23b5366628</id>
      </parent>
    </parents>
    <author>
      <name>shingara</name>
      <email>cyril.mougel@gmail.com</email>
    </author>
    <url>http://github.com/meekish/collective/commit/2297726af960c694c188f5c1a72a6868444701e2</url>
    <id>2297726af960c694c188f5c1a72a6868444701e2</id>
    <committed-date>2008-06-02T14:13:17-07:00</committed-date>
    <authored-date>2008-06-02T14:13:17-07:00</authored-date>
    <message>Add a generate a diff unified between several version. But there are no Spec, It s bad, needed quickly</message>
    <tree>0242dbfc9f1e8e603a8d36c9808c4e69bf852a1e</tree>
    <committer>
      <name>shingara</name>
      <email>cyril.mougel@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>6d97241befdce93bad6e98809fa1f91c3ff3821a</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/058ab2a755a7670c6f4916ee5d40a02116172aa9</url>
    <id>058ab2a755a7670c6f4916ee5d40a02116172aa9</id>
    <committed-date>2008-05-22T11:48:03-07:00</committed-date>
    <authored-date>2008-05-22T11:48:03-07:00</authored-date>
    <message>Theme stylesheets, site title, and site footer are now configurable in config/collective.yml</message>
    <tree>fb9a0e4a4521b6664f82cfcb50bf79284e558580</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>621db92d9735e5cf1ef360695f2ff54caf156b17</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/f932f6514969eeafcd27ae5c9268f6963654d74f</url>
    <id>f932f6514969eeafcd27ae5c9268f6963654d74f</id>
    <committed-date>2008-05-20T16:22:55-07:00</committed-date>
    <authored-date>2008-05-20T16:22:55-07:00</authored-date>
    <message>Moved can_has_fixtures dependency to test environment</message>
    <tree>c98d98488658e04f1635c484dcddda9dc53d1e9e</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>3a94019b2b616b38b428c89f0563fc6192187874</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/34a38aba8ffea512189a081effa015eb0e16d817</url>
    <id>34a38aba8ffea512189a081effa015eb0e16d817</id>
    <committed-date>2008-05-20T15:09:25-07:00</committed-date>
    <authored-date>2008-05-20T15:09:25-07:00</authored-date>
    <message>Implemented parts controller and view for recent activity sidebar</message>
    <tree>1e365d8418166165a772d78a8351b36dcc6528b5</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>56454c2cc77d6c8d8a202a1a646ebfee80a60f96</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/3a94019b2b616b38b428c89f0563fc6192187874</url>
    <id>3a94019b2b616b38b428c89f0563fc6192187874</id>
    <committed-date>2008-05-20T14:53:32-07:00</committed-date>
    <authored-date>2008-05-20T14:53:32-07:00</authored-date>
    <message>Implemented Version.recent to retrieve the most recent versions</message>
    <tree>73da09c56c4c8340affffc67a9681bdd72ca8e99</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d4d7b3e839cabc4621c16635efdac23b55ac61ba</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/da4b7b1b5cf7eae009e2bd5177a5b9395a72393d</url>
    <id>da4b7b1b5cf7eae009e2bd5177a5b9395a72393d</id>
    <committed-date>2008-05-05T23:57:02-07:00</committed-date>
    <authored-date>2008-05-05T23:57:02-07:00</authored-date>
    <message>Collective now utilizes a user-editable page at the root url.</message>
    <tree>37173f26f102e4c83c00fe5cf29c99f3889879dd</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>6e5101b90d8a023ff8d837fe2e6a737d75d11562</id>
      </parent>
    </parents>
    <author>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </author>
    <url>http://github.com/meekish/collective/commit/1399b6940c2778c4fc474641c4bbb541ddc25c6a</url>
    <id>1399b6940c2778c4fc474641c4bbb541ddc25c6a</id>
    <committed-date>2008-04-22T10:08:53-07:00</committed-date>
    <authored-date>2008-04-22T10:08:53-07:00</authored-date>
    <message>oops! double included RedCloth</message>
    <tree>1b65439983a1f1e4764b5ecfec4860fd464e8d5c</tree>
    <committer>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>614aa232bbbba9ba4eca58b0d31ed889fbbb6602</id>
      </parent>
      <parent>
        <id>b8570b826bab69c77d2506eeb323756f04fd050d</id>
      </parent>
    </parents>
    <author>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </author>
    <url>http://github.com/meekish/collective/commit/6e5101b90d8a023ff8d837fe2e6a737d75d11562</url>
    <id>6e5101b90d8a023ff8d837fe2e6a737d75d11562</id>
    <committed-date>2008-04-22T07:30:23-07:00</committed-date>
    <authored-date>2008-04-22T07:30:23-07:00</authored-date>
    <message>Merge branch 'meekish'

Conflicts:

	config/init.rb</message>
    <tree>997195726101d4c2fbfa822ae88ae59b69228886</tree>
    <committer>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>0d2ecf47633d38baba6516e3bb1c50720fe390e9</id>
      </parent>
    </parents>
    <author>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </author>
    <url>http://github.com/meekish/collective/commit/69ad6b0420d23ac036803ab35155d56a5f2dbc32</url>
    <id>69ad6b0420d23ac036803ab35155d56a5f2dbc32</id>
    <committed-date>2008-04-21T22:46:02-07:00</committed-date>
    <authored-date>2008-04-21T22:46:02-07:00</authored-date>
    <message>Cut the internal Viking ties</message>
    <tree>4a77bbde4215e09f37229f589846aa9bc84e66ca</tree>
    <committer>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>bcab34a2e95bdc77896d15dfe734a9b9a36f62cc</id>
      </parent>
    </parents>
    <author>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </author>
    <url>http://github.com/meekish/collective/commit/0d2ecf47633d38baba6516e3bb1c50720fe390e9</url>
    <id>0d2ecf47633d38baba6516e3bb1c50720fe390e9</id>
    <committed-date>2008-04-21T22:41:16-07:00</committed-date>
    <authored-date>2008-04-21T22:39:16-07:00</authored-date>
    <message>Add a dependency for Viking</message>
    <tree>f7dc7df7ac48a298be114dd786efa77103f6cf09</tree>
    <committer>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>1b8682df0ed9b6f02536c4aa476e31e9777dff7d</id>
      </parent>
    </parents>
    <author>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </author>
    <url>http://github.com/meekish/collective/commit/bcab34a2e95bdc77896d15dfe734a9b9a36f62cc</url>
    <id>bcab34a2e95bdc77896d15dfe734a9b9a36f62cc</id>
    <committed-date>2008-04-21T22:40:14-07:00</committed-date>
    <authored-date>2008-04-21T22:40:14-07:00</authored-date>
    <message>We don't need this any more</message>
    <tree>893bd73f1764fff4516dd4aa6df44409d05c258f</tree>
    <committer>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>7fd6b2deaaad7c50eff5ecb9e8c16863f967bfd6</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/ed644181bc8996e6406165558e52dc3cc46f8f17</url>
    <id>ed644181bc8996e6406165558e52dc3cc46f8f17</id>
    <committed-date>2008-04-20T14:10:26-07:00</committed-date>
    <authored-date>2008-04-20T14:10:26-07:00</authored-date>
    <message>Ensure that we don't try to seed the database before it exists.</message>
    <tree>d168f8be7de9842d3c6c7505f7623bb2c08ccc65</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>6e118d5cdc573ab52a56d0645a9cc0c964de710e</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/04407a278d87151580d1ab1ea9111c8c606647de</url>
    <id>04407a278d87151580d1ab1ea9111c8c606647de</id>
    <committed-date>2008-04-20T08:35:43-07:00</committed-date>
    <authored-date>2008-04-20T08:35:43-07:00</authored-date>
    <message>Documented RedCloth workaround</message>
    <tree>697c0f43611ed9f51ba6e1bac2b98b223bccefa7</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>f7ae76ef2e2b5cdb70b7f5bdc15e806f5ef16cd5</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/6e118d5cdc573ab52a56d0645a9cc0c964de710e</url>
    <id>6e118d5cdc573ab52a56d0645a9cc0c964de710e</id>
    <committed-date>2008-04-20T08:13:21-07:00</committed-date>
    <authored-date>2008-04-20T08:13:21-07:00</authored-date>
    <message>Don't use the #dependencies helper for RedCloth. It doesn't work.</message>
    <tree>661af23c65135866e835bf74d687fe7932f6998e</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>84b251f7420d89276dcca66fa26f9e2f8d06bd6e</id>
      </parent>
    </parents>
    <author>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </author>
    <url>http://github.com/meekish/collective/commit/6b78ece9ab2c1590e46f10f0a2b2db6b3fe99c78</url>
    <id>6b78ece9ab2c1590e46f10f0a2b2db6b3fe99c78</id>
    <committed-date>2008-04-18T04:54:21-07:00</committed-date>
    <authored-date>2008-04-18T04:54:21-07:00</authored-date>
    <message>Make the sample a little more clear</message>
    <tree>275077a0acf426084908e4388d557ffcdf005df7</tree>
    <committer>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>39379f85ce0c55ca47c92e5a010993030e29b234</id>
      </parent>
      <parent>
        <id>8fcfee3df515a044a1613d71ebbff677dc98b5e1</id>
      </parent>
    </parents>
    <author>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </author>
    <url>http://github.com/meekish/collective/commit/a855b5e68e96080d5e056b915772bac6cb049a01</url>
    <id>a855b5e68e96080d5e056b915772bac6cb049a01</id>
    <committed-date>2008-04-17T21:49:10-07:00</committed-date>
    <authored-date>2008-04-17T21:49:10-07:00</authored-date>
    <message>Merge branch 'improve_viking'

Conflicts:

	.gitignore
	app/controllers/edits.rb
	app/controllers/pages_mixins/defensio_spam_protection.rb
	app/helpers/edits_helper.rb
	app/models/page.rb
	config/init.rb
	lib/viking/viking/base.rb
	spec/controllers/edits_spec.rb
	spec/controllers/pages_spec.rb
	spec/models/page_spec.rb
	spec/models/version_spec.rb
	spec/shared/private_methods_helper.rb</message>
    <tree>1692e8a44921c5bde37e57a095e3b44cfb14f62d</tree>
    <committer>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>64152fa3a65bb108e8c8f42335560164017021a8</id>
      </parent>
    </parents>
    <author>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </author>
    <url>http://github.com/meekish/collective/commit/60b1e29fafc58a2cb09483ad70df590e29ee0e1e</url>
    <id>60b1e29fafc58a2cb09483ad70df590e29ee0e1e</id>
    <committed-date>2008-04-16T14:11:17-07:00</committed-date>
    <authored-date>2008-04-16T14:11:17-07:00</authored-date>
    <message>Won't need this any more</message>
    <tree>d4a19f82d7716a9091fe018faa6f4f7759495d87</tree>
    <committer>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>5a1f43fe86d8ab2ee8c5b7c65091c5673e4feb40</id>
      </parent>
    </parents>
    <author>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </author>
    <url>http://github.com/meekish/collective/commit/d3a93be7a255346d1b472c02f1e8cd4e246ae3f6</url>
    <id>d3a93be7a255346d1b472c02f1e8cd4e246ae3f6</id>
    <committed-date>2008-04-16T06:55:49-07:00</committed-date>
    <authored-date>2008-04-16T06:55:49-07:00</authored-date>
    <message>Cleaned out unused code</message>
    <tree>7944e50fe1798f4dedd4266c89edd323fdd62e8a</tree>
    <committer>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>6eef91ad362634171000f3a558c3f4afdcfa9e97</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/c4007d1475ac5d2d63df90704809cae562de3038</url>
    <id>c4007d1475ac5d2d63df90704809cae562de3038</id>
    <committed-date>2008-04-15T01:05:19-07:00</committed-date>
    <authored-date>2008-04-15T01:05:19-07:00</authored-date>
    <message>AutoMigrate the development database at every boot</message>
    <tree>fa6a8f7b4f39c230e23e5af0a1609b667a2da97a</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>032a4193f40570582d762fa2ea7f58325e78fc73</id>
      </parent>
      <parent>
        <id>3d7cdb208bd68fbd9a1493a35a09249e76752b92</id>
      </parent>
    </parents>
    <author>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </author>
    <url>http://github.com/meekish/collective/commit/d54e8d18fd2112aff2ee4e9b0120d2574409593f</url>
    <id>d54e8d18fd2112aff2ee4e9b0120d2574409593f</id>
    <committed-date>2008-04-14T01:29:09-07:00</committed-date>
    <authored-date>2008-04-14T01:29:09-07:00</authored-date>
    <message>Merge branch 'jherdman/master'

Conflicts:

	app/controllers/edits.rb
	app/models/version.rb
	spec/models/page_spec.rb
	spec/models/version_spec.rb</message>
    <tree>9165dfe661b4666c11050e64a3cae789b4885351</tree>
    <committer>
      <name>Jed Hurt</name>
      <email>jedhurt@cableone.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>7d0a42482edac672080070ed404b97a1c9352bf9</id>
      </parent>
    </parents>
    <author>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </author>
    <url>http://github.com/meekish/collective/commit/4aa23626e549acf2a37023e42779d64560d517fa</url>
    <id>4aa23626e549acf2a37023e42779d64560d517fa</id>
    <committed-date>2008-04-14T00:35:00-07:00</committed-date>
    <authored-date>2008-04-14T00:35:00-07:00</authored-date>
    <message>Load everything in lib</message>
    <tree>5919ad4c6e03dc17b9985bb432a7525e64a58cf3</tree>
    <committer>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>a5de8e8b21ebae3a1db02e5f6952b9930316d3cc</id>
      </parent>
    </parents>
    <author>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </author>
    <url>http://github.com/meekish/collective/commit/ff867108ee23d7c029f7106944189083159f5175</url>
    <id>ff867108ee23d7c029f7106944189083159f5175</id>
    <committed-date>2008-04-13T23:24:50-07:00</committed-date>
    <authored-date>2008-04-13T23:24:50-07:00</authored-date>
    <message>This should happen before the app loads</message>
    <tree>cb7aed7f63079f2d9c17813d0ac47c68cd0ebe16</tree>
    <committer>
      <name>James Herdman</name>
      <email>james.herdman@gmail.com</email>
    </committer>
  </commit>
</commits>
