<?xml version="1.0" encoding="UTF-8"?>
<commits type="array">
  <commit>
    <parents type="array">
      <parent>
        <id>c101028c576e1552184b8463cd5f38dac2b65473</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/ec32b9c279ae40e5b55ded2d1f6193e945e08192</url>
    <id>ec32b9c279ae40e5b55ded2d1f6193e945e08192</id>
    <committed-date>2009-12-05T07:43:52-08:00</committed-date>
    <authored-date>2009-12-05T07:43:52-08:00</authored-date>
    <message>remove additional homepage data test</message>
    <tree>7079e032dc934ba0e9342c4039627a2726a6c59f</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>a4cdf664c33855e4c038c5c4df59dc278a5421ea</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/c101028c576e1552184b8463cd5f38dac2b65473</url>
    <id>c101028c576e1552184b8463cd5f38dac2b65473</id>
    <committed-date>2009-11-20T09:16:40-08:00</committed-date>
    <authored-date>2009-11-20T09:16:40-08:00</authored-date>
    <message>fix install template</message>
    <tree>3aa7f674aa3395415b5463218ceb5d16a60d7804</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>5d4e8f7f12ac0e6ee0ca6d6774004fd9f0341acf</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/a4cdf664c33855e4c038c5c4df59dc278a5421ea</url>
    <id>a4cdf664c33855e4c038c5c4df59dc278a5421ea</id>
    <committed-date>2009-11-20T09:08:06-08:00</committed-date>
    <authored-date>2009-11-20T09:08:06-08:00</authored-date>
    <message>update install template</message>
    <tree>c1a77e1f02363be96b9ef464792af0b4d2953e7e</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>095635daeb5ff245457d14dc8bba223186d16262</id>
      </parent>
      <parent>
        <id>4dc634265c7c756b8da707dc2e40099716e9476a</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/5d4e8f7f12ac0e6ee0ca6d6774004fd9f0341acf</url>
    <id>5d4e8f7f12ac0e6ee0ca6d6774004fd9f0341acf</id>
    <committed-date>2009-11-20T08:13:54-08:00</committed-date>
    <authored-date>2009-11-20T08:13:54-08:00</authored-date>
    <message>Merge branch 'edge' of github.com:bborn/communityengine into edge</message>
    <tree>b255bd8ece3badddea8e599327c6df85a8cfef1e</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>7f7d14d5890295f03694380c6d475a01eb553adf</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/095635daeb5ff245457d14dc8bba223186d16262</url>
    <id>095635daeb5ff245457d14dc8bba223186d16262</id>
    <committed-date>2009-11-20T08:13:45-08:00</committed-date>
    <authored-date>2009-11-20T08:13:45-08:00</authored-date>
    <message>add searchlogic and use it on admincontroller#comments</message>
    <tree>1be6c152da3fdf28e15f86f1aff569934a30f732</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>223493097a744a092555a02c09cfbf791b62547f</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/4dc634265c7c756b8da707dc2e40099716e9476a</url>
    <id>4dc634265c7c756b8da707dc2e40099716e9476a</id>
    <committed-date>2009-11-19T11:06:08-08:00</committed-date>
    <authored-date>2009-11-19T11:06:08-08:00</authored-date>
    <message>oops, fixed that last commit</message>
    <tree>5d6706bda29b1b732d8a00630f01e2902b22b0f8</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>9fcfe005adf34950e0a22ea5faa9b0c625a38d2b</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/223493097a744a092555a02c09cfbf791b62547f</url>
    <id>223493097a744a092555a02c09cfbf791b62547f</id>
    <committed-date>2009-11-19T11:03:41-08:00</committed-date>
    <authored-date>2009-11-19T11:03:41-08:00</authored-date>
    <message>force set current_user during session create</message>
    <tree>4c2b22d109738a333de595c727831be63e3cbf07</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>1f35776295a97cb2a66c0af2324ffd00bea8596e</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/9fcfe005adf34950e0a22ea5faa9b0c625a38d2b</url>
    <id>9fcfe005adf34950e0a22ea5faa9b0c625a38d2b</id>
    <committed-date>2009-11-19T08:45:19-08:00</committed-date>
    <authored-date>2009-11-19T08:45:19-08:00</authored-date>
    <message>oops, remove a debug line</message>
    <tree>6f13e327f4c8c3da64fa5b73985cc31f191bac89</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>7f7d14d5890295f03694380c6d475a01eb553adf</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/1f35776295a97cb2a66c0af2324ffd00bea8596e</url>
    <id>1f35776295a97cb2a66c0af2324ffd00bea8596e</id>
    <committed-date>2009-11-19T08:31:02-08:00</committed-date>
    <authored-date>2009-11-19T08:31:02-08:00</authored-date>
    <message>allow plugins to add header tabs easily</message>
    <tree>661723b3778113def8de33a24a531953c4fc60b3</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>e1c68bfccfc3bb45d78b9ec7e429b08462efb843</id>
      </parent>
      <parent>
        <id>6d05a06f4d77661eb181033630dc4b702f10efec</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/7f7d14d5890295f03694380c6d475a01eb553adf</url>
    <id>7f7d14d5890295f03694380c6d475a01eb553adf</id>
    <committed-date>2009-11-18T12:55:27-08:00</committed-date>
    <authored-date>2009-11-18T12:55:27-08:00</authored-date>
    <message>Merge branch 'edge' of github.com:bborn/communityengine into edge</message>
    <tree>478ec596310c90e04893b4c5927d292bc159b1a2</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d7aed6d5d57671be5738772ef3d18dba206fed95</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/e1c68bfccfc3bb45d78b9ec7e429b08462efb843</url>
    <id>e1c68bfccfc3bb45d78b9ec7e429b08462efb843</id>
    <committed-date>2009-11-18T12:55:14-08:00</committed-date>
    <authored-date>2009-11-18T12:55:14-08:00</authored-date>
    <message>little sql injection vulnerability fix</message>
    <tree>148807732806cbde1e0d89b0c11f84526843a4cc</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d7aed6d5d57671be5738772ef3d18dba206fed95</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/6d05a06f4d77661eb181033630dc4b702f10efec</url>
    <id>6d05a06f4d77661eb181033630dc4b702f10efec</id>
    <committed-date>2009-11-17T13:17:12-08:00</committed-date>
    <authored-date>2009-11-17T13:17:12-08:00</authored-date>
    <message>bugfix</message>
    <tree>6e7a174654f87cd120e096405a2c36048b9abed6</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>724aba752dade6a70340748840f068865787813f</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/d7aed6d5d57671be5738772ef3d18dba206fed95</url>
    <id>d7aed6d5d57671be5738772ef3d18dba206fed95</id>
    <committed-date>2009-11-17T09:19:31-08:00</committed-date>
    <authored-date>2009-11-17T09:19:31-08:00</authored-date>
    <message>fix user notifier typo</message>
    <tree>25e301a0ddf9743139c4bfe8efa7695a7c273730</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>a37e1f9e9bcbc1a4bd8986916a999bfc3b5b46be</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/724aba752dade6a70340748840f068865787813f</url>
    <id>724aba752dade6a70340748840f068865787813f</id>
    <committed-date>2009-11-17T09:08:11-08:00</committed-date>
    <authored-date>2009-11-17T09:08:11-08:00</authored-date>
    <message>use updated from syntax in user notifier</message>
    <tree>1acb0e4bdc94e3b88388fb1a5714a33214b9b629</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>482e875f40da24f4bf37a32ebecaa9afae22e6a1</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/a37e1f9e9bcbc1a4bd8986916a999bfc3b5b46be</url>
    <id>a37e1f9e9bcbc1a4bd8986916a999bfc3b5b46be</id>
    <committed-date>2009-11-12T11:41:21-08:00</committed-date>
    <authored-date>2009-11-12T11:41:21-08:00</authored-date>
    <message>add user test to prove that unactivated users do not screw up find_by_activity</message>
    <tree>8f13ee469d271ea9d8b057abfdc910b79a9b8d4b</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>a872412d163e22054e5e252ba314646f5e8e69f4</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/482e875f40da24f4bf37a32ebecaa9afae22e6a1</url>
    <id>482e875f40da24f4bf37a32ebecaa9afae22e6a1</id>
    <committed-date>2009-11-12T11:19:17-08:00</committed-date>
    <authored-date>2009-11-12T11:19:17-08:00</authored-date>
    <message>bump version and make all tests pass on 2.3.4</message>
    <tree>b44279e0859ce0f18d23aa31891092b4e0f48bcb</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>098e72abd7e731a9aa3102489f72d93e252f3d12</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/a872412d163e22054e5e252ba314646f5e8e69f4</url>
    <id>a872412d163e22054e5e252ba314646f5e8e69f4</id>
    <committed-date>2009-11-12T10:57:00-08:00</committed-date>
    <authored-date>2009-11-12T10:57:00-08:00</authored-date>
    <message>fix install template location for edge</message>
    <tree>87104abcef495520b7aac2d0c4eadf992e0cfb5b</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>9b7e2e3e1ec6543a03dc64faaecf014de639ba09</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/098e72abd7e731a9aa3102489f72d93e252f3d12</url>
    <id>098e72abd7e731a9aa3102489f72d93e252f3d12</id>
    <committed-date>2009-11-09T07:40:47-08:00</committed-date>
    <authored-date>2009-11-09T07:40:47-08:00</authored-date>
    <message>don't force crypted password to be present in database (use Rails validations)</message>
    <tree>74b7db9f8a9cee0afeed46c1b41f3b33d9ef99cb</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>2ec1573ce18b421527e099d3d04cf5e964e2a079</id>
      </parent>
      <parent>
        <id>e97a06a1b692856fce977fd8ec4d3864494a07c0</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/9b7e2e3e1ec6543a03dc64faaecf014de639ba09</url>
    <id>9b7e2e3e1ec6543a03dc64faaecf014de639ba09</id>
    <committed-date>2009-10-30T07:33:16-07:00</committed-date>
    <authored-date>2009-10-30T07:33:16-07:00</authored-date>
    <message>Merge branch 'edge' of github.com:bborn/communityengine into edge</message>
    <tree>3815c24975ec5742e68a4d6c9fd1e83ab2c42e7f</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>15701ae34beeb1e56c063fa93c33b8fabaf2c690</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/2ec1573ce18b421527e099d3d04cf5e964e2a079</url>
    <id>2ec1573ce18b421527e099d3d04cf5e964e2a079</id>
    <committed-date>2009-10-30T07:33:00-07:00</committed-date>
    <authored-date>2009-10-30T07:33:00-07:00</authored-date>
    <message>fix post helper</message>
    <tree>f442ac7c3ba6e833bdad6fdb9abd309dbca06748</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>b3bb6ddefc51fe37a9d43a93eb2cd166046cf37f</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/e97a06a1b692856fce977fd8ec4d3864494a07c0</url>
    <id>e97a06a1b692856fce977fd8ec4d3864494a07c0</id>
    <committed-date>2009-10-29T10:33:20-07:00</committed-date>
    <authored-date>2009-10-29T10:33:20-07:00</authored-date>
    <message>updating tests to new format, hopefully speeding up test suite</message>
    <tree>f0b31fc5b4a6a276a13ff3008fcb0f4ec0ad8dff</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>21836ef1e9df5051a590f7f1f055f3ef5cd13776</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/b3bb6ddefc51fe37a9d43a93eb2cd166046cf37f</url>
    <id>b3bb6ddefc51fe37a9d43a93eb2cd166046cf37f</id>
    <committed-date>2009-10-28T12:52:34-07:00</committed-date>
    <authored-date>2009-10-28T12:52:34-07:00</authored-date>
    <message>change all uses_tiny_mce calls to use block format</message>
    <tree>0c8f45a6310d9ee8e8e0044d76af5d52b35467d9</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>15701ae34beeb1e56c063fa93c33b8fabaf2c690</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/21836ef1e9df5051a590f7f1f055f3ef5cd13776</url>
    <id>21836ef1e9df5051a590f7f1f055f3ef5cd13776</id>
    <committed-date>2009-10-28T12:45:06-07:00</committed-date>
    <authored-date>2009-10-28T12:45:06-07:00</authored-date>
    <message>allow tiny_mce helper to accept a block to prevent error when overriding controllers</message>
    <tree>3b619d309f4d8e2cd5f10d686eef4de163a548c3</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>8fd0800b296da236fc4bdde6b629932e1bc17ae4</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/15701ae34beeb1e56c063fa93c33b8fabaf2c690</url>
    <id>15701ae34beeb1e56c063fa93c33b8fabaf2c690</id>
    <committed-date>2009-10-23T19:17:03-07:00</committed-date>
    <authored-date>2009-10-23T19:17:03-07:00</authored-date>
    <message>bugfix</message>
    <tree>6cd2c0be0faca89ed79ef67f1ac04715ac249415</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>dc0cdf88eab8a2da8f863ab78711d4cb5586f5f8</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/8fd0800b296da236fc4bdde6b629932e1bc17ae4</url>
    <id>8fd0800b296da236fc4bdde6b629932e1bc17ae4</id>
    <committed-date>2009-10-23T18:40:09-07:00</committed-date>
    <authored-date>2009-10-23T18:40:09-07:00</authored-date>
    <message>update README</message>
    <tree>5975fa8eacc49ae6964fa677d9c43c3310731cdd</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>240c3276b4743f216557e7602ecaf2d0417b25c9</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/dc0cdf88eab8a2da8f863ab78711d4cb5586f5f8</url>
    <id>dc0cdf88eab8a2da8f863ab78711d4cb5586f5f8</id>
    <committed-date>2009-10-23T18:25:02-07:00</committed-date>
    <authored-date>2009-10-23T18:25:02-07:00</authored-date>
    <message>more i18n stuff</message>
    <tree>2c6036be17ee9f93a8aad3963a55d7e68d2e2b23</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>bdbc2c449b90be404e04557baa2eee9c9b04430f</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/240c3276b4743f216557e7602ecaf2d0417b25c9</url>
    <id>240c3276b4743f216557e7602ecaf2d0417b25c9</id>
    <committed-date>2009-10-23T18:10:11-07:00</committed-date>
    <authored-date>2009-10-23T18:10:11-07:00</authored-date>
    <message>cleaning up en.yml</message>
    <tree>9e9041bce5282faa3f338721113f0589777bfc56</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>5f21ca410923522a046cdc251d29f7a3076a4f16</id>
      </parent>
      <parent>
        <id>d4f63e3532b1d4275f14dfe7dc0980fb9de47c83</id>
      </parent>
    </parents>
    <author>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/bdbc2c449b90be404e04557baa2eee9c9b04430f</url>
    <id>bdbc2c449b90be404e04557baa2eee9c9b04430f</id>
    <committed-date>2009-10-09T06:25:08-07:00</committed-date>
    <authored-date>2009-10-09T06:25:08-07:00</authored-date>
    <message>Merge branch 'edge' of git://github.com/sdecleire/communityengine into sdecleire/edge

Conflicts:
	app/models/user.rb
	lang/base.yml
	lang/ui/en-US.yml</message>
    <tree>452c8062d8bcc1b05b95af44b3c7819ba8646e32</tree>
    <committer>
      <name>bborn</name>
      <email>bruno.bornsztein@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>169ff695e19c4de116cc9b5037605734a25c01e3</id>
      </parent>
    </parents>
    <author>
      <name>Stephane Decleire</name>
      <email>stephane.decleire@cariboo-networks.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/d4f63e3532b1d4275f14dfe7dc0980fb9de47c83</url>
    <id>d4f63e3532b1d4275f14dfe7dc0980fb9de47c83</id>
    <committed-date>2009-10-07T03:02:31-07:00</committed-date>
    <authored-date>2009-10-07T03:02:31-07:00</authored-date>
    <message>catching up with the edge</message>
    <tree>c3bffbee81dd80658383ef6781a1a2ef8052f9c2</tree>
    <committer>
      <name>Stephane Decleire</name>
      <email>stephane.decleire@cariboo-networks.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>b03474f2766a7ba2304d4b55b4436f8184ed5b80</id>
      </parent>
      <parent>
        <id>ce994e23794346f86fdfc5ea29a1a51a36b7096e</id>
      </parent>
    </parents>
    <author>
      <name>Stephane Decleire</name>
      <email>stephane.decleire@cariboo-networks.com</email>
    </author>
    <url>http://github.com/bborn/communityengine/commit/169ff695e19c4de116cc9b5037605734a25c01e3</url>
    <id>169ff695e19c4de116cc9b5037605734a25c01e3</id>
    <committed-date>2009-10-06T02:10:08-07:00</committed-date>
    <authored-date>2009-10-06T02:10:08-07:00</authored-date>
    <message>Merge with the edge branch</message>
    <tree>eb7394a6c37a0344115f98e3de52e5c7dc28bf0f</tree>
    <committer>
      <name>Stephane Decleire</name>
      <email>stephane.decleire@cariboo-networks.com</email>
    </committer>
  </commit>
</commits>
