<feed xmlns='http://www.w3.org/2005/Atom'>
<title>semanticscuttle/data/templates/testdummy, branch v0.98.6</title>
<subtitle>Self-hosted and web-based social bookmark manager</subtitle>
<id>https://git.fluxo.info/semanticscuttle/atom?h=v0.98.6</id>
<link rel='self' href='https://git.fluxo.info/semanticscuttle/atom?h=v0.98.6'/>
<link rel='alternate' type='text/html' href='https://git.fluxo.info/semanticscuttle/'/>
<updated>2011-06-04T04:38:07+00:00</updated>
<entry>
<title>Merge branch 'master' into privatekey2</title>
<updated>2011-06-04T04:38:07+00:00</updated>
<author>
<name>Mark Pemberton</name>
<email>mpemberton5@gmail.com</email>
</author>
<published>2011-06-04T04:38:07+00:00</published>
<link rel='alternate' type='text/html' href='https://git.fluxo.info/semanticscuttle/commit/?id=b628e63e015bc3b2eadc712feaa6c4d05cf75bbd'/>
<id>urn:sha1:b628e63e015bc3b2eadc712feaa6c4d05cf75bbd</id>
<content type='text'>
Conflicts:

	data/templates/default/bookmarks.tpl.php
</content>
</entry>
<entry>
<title>implement request #1989987: theme support. merge themes branch with --squash</title>
<updated>2011-05-25T17:43:36+00:00</updated>
<author>
<name>Christian Weiske</name>
<email>cweiske@cweiske.de</email>
</author>
<published>2011-05-25T17:43:36+00:00</published>
<link rel='alternate' type='text/html' href='https://git.fluxo.info/semanticscuttle/commit/?id=5ba53394fcda4ae9cfa9af52b37fb67517deeb5a'/>
<id>urn:sha1:5ba53394fcda4ae9cfa9af52b37fb67517deeb5a</id>
<content type='text'>
</content>
</entry>
</feed>
