commit 844a1a38cc6f84f71542003bf10e273f978f2f5e Merge: 754e669 4aeface Author: George Kadianakis desnacked@riseup.net Date: Fri Mar 9 16:22:57 2012 -0800

Merge branch 'bug5313'

Conflicts: ChangeLog

ChangeLog | 1 + README | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-)

diff --cc ChangeLog index 2e5cfa7,4e7cdbe..7cef66e --- a/ChangeLog +++ b/ChangeLog @@@ -5,8 -5,7 +5,9 @@@ Changes in version 0.1.1 - <not yet rel Fixes bug #5312. Patch by Peter Palfrader. - Allow doxygen documentation to be built in out-of-source builds. Fixes bug #5315. Patch by Peter Palfrader. + - Fix out-of-source building of tester.py. Fixes bug #5310. Patch by + Peter Palfrader. + - Improve README installation instructions. Fixes bug #5313.

Changes in version 0.1.0 - 2012-03-05