<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array"/>
  <removed type="array">
    <removed>
      <filename>lib/pdoc</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>2177d74050bf2d2b8f6e95eef20526ec16c3ba79</id>
    </parent>
    <parent>
      <id>4f9d08866f8b00d899e89f642b62aec1f1485351</id>
    </parent>
  </parents>
  <author>
    <name>Sven G. Br&#246;nstrup</name>
    <email>broenstrup@spom.net</email>
  </author>
  <url>http://github.com/starpeak/prototypeui/commit/9d2119d045e8c057b9112774fa22e1dae702b5e4</url>
  <id>9d2119d045e8c057b9112774fa22e1dae702b5e4</id>
  <committed-date>2008-06-11T09:57:51-07:00</committed-date>
  <authored-date>2008-06-11T09:57:51-07:00</authored-date>
  <message>Merge branch 'master' of git://github.com/charettes/prototypeui

Conflicts:

	.gitignore</message>
  <tree>9bd3957a993c4e2ad2f988cd49f69f43801c404e</tree>
  <committer>
    <name>Sven G. Br&#246;nstrup</name>
    <email>broenstrup@spom.net</email>
  </committer>
</commit>
