Merge branch 'master' of github.com:divVerent/d0_blind_id
authorRudolf Polzer <divverent@alientrap.org>
Wed, 11 Aug 2010 11:51:49 +0000 (13:51 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 11 Aug 2010 11:51:49 +0000 (13:51 +0200)
commit4145420d34f05696e610e2f414874312ad572479
tree72e29109622fb8a12c7dba61ffbd1998a2464be7
parenta4998e469a8b0740824687c77eb61501d8027d3b
parentb016b8bd800cd6171366317e3a3db7a6d5b80243
Merge branch 'master' of github.com:divVerent/d0_blind_id

Conflicts:
Makefile.am
Makefile.am