I hate failed merges
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 25 Mar 2009 09:52:02 +0000 (09:52 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 25 Mar 2009 09:52:02 +0000 (09:52 +0000)
commitd0a576c466b4aad3cc044a459c4e36f719738ec5
tree130989e9f1060f89254f36201d296df948d42ebb
parent035fffc6a58e65cdb99ee41cdd843345c7700f67
parent6267b857abe8e71547f34e00b6813e086dace360
I hate failed merges