Merge branch 'work/itemref-20100118'
authorPhilip Jägenstedt <philip@foolip.org>
Sat, 30 Jan 2010 13:13:37 +0000 (14:13 +0100)
committerPhilip Jägenstedt <philip@foolip.org>
Sat, 30 Jan 2010 13:13:37 +0000 (14:13 +0100)
commitb67e13ea189cf8d4f00cc1729f629c8c8c1d5399
tree73232660b37bd3dc32df1f5caa19f66945723ec2
parentff9b5ae89a149ee6d823682a5b2f5df1a5848dc4
parent18ebae497d6753d76c17fd51de7d1e427c0b9ee8
Merge branch 'work/itemref-20100118'

Conflicts:
microdata.js
microdata.js