Merge master.
authorCarl Hetherington <cth@carlh.net>
Tue, 18 Mar 2014 18:26:03 +0000 (18:26 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 18 Mar 2014 18:26:03 +0000 (18:26 +0000)
commit77b0ffe6c50796b8fb132f56394995e0df089713
treecf0e1ddde617605be10d6606c1f0587d6762061c
parent693fd6ddef3c4bb74c81bb9cf25bfdb79246f274
parent90c23c53318af92fc7e77d12a612eab619aff937
Merge master.
src/exceptions.cc
test/test.cc
tools/dcpinfo.cc