Merge remote-tracking branch 'remotes/paurkedal/t/disclaim-pullreq' into paurkedal...
authorIvan Maidanski <ivmai@mail.ru>
Fri, 23 Sep 2011 10:47:59 +0000 (14:47 +0400)
committerIvan Maidanski <ivmai@mail.ru>
Fri, 23 Sep 2011 10:47:59 +0000 (14:47 +0400)
commit33d8645dc6a2c1c130f0c334e2d51c3f8c5b0de8
tree585dcd2dc4d9f06bf1b8f446a28e46b7c0f48c9a
parent2aa783260816855e59fe3244658e7c2b2e2cea6e
parent831e2f2123539ce464a1a8b4c328c9275db2b6da
Merge remote-tracking branch 'remotes/paurkedal/t/disclaim-pullreq' into paurkedal-disclaim-v2
Makefile.am
Makefile.direct
Makefile.dj
configure.ac
mark.c
tests/tests.am