<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array"/>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>0ebe172fc924980d9798cf7c97d11ee253704657</id>
    </parent>
    <parent>
      <id>bd14194a011bdc60796135e583045fea5ba7eb6f</id>
    </parent>
  </parents>
  <author>
    <name>Sven G. Br&#246;nstrup</name>
    <email>broenstrup@spom.net</email>
  </author>
  <url>http://github.com/starpeak/prototypeui/commit/9e0abe0ca99cec9786bd3cbafcb38d8ce1c70ba4</url>
  <id>9e0abe0ca99cec9786bd3cbafcb38d8ce1c70ba4</id>
  <committed-date>2008-10-06T13:06:32-07:00</committed-date>
  <authored-date>2008-10-06T13:06:32-07:00</authored-date>
  <message>Merge commit 'xilinus/master'

Conflicts:
	lib/pdoc
	src/auto_complete/auto_complete.js
	test/functional/auto_complete/test_auto_complete_token.html</message>
  <tree>ace110f709944abe9e6d75d87e0d7898b2261057</tree>
  <committer>
    <name>Sven G. Br&#246;nstrup</name>
    <email>broenstrup@spom.net</email>
  </committer>
</commit>
