Merge branch 'master' of git://git.indexdata.com/id-docbook-common
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 30 May 2012 07:50:05 +0000 (09:50 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 30 May 2012 07:50:05 +0000 (09:50 +0200)
commitc6e4db90ce6779ee42fafd38e776176d38c2844b
tree6efb1bec8df2b0284adacad07b859e3d15281a6d
parent61d919ebf1d24bf4361a29b2cc2a327e25ff1e61
parentca8f04fe52cd2cb481af6fac38a15bc12ad8c530
Merge branch 'master' of git://git.indexdata.com/id-docbook-common

Conflicts:
common.ent
common.ent