Merge branch 'refactoring'
authorPete Fotheringham (XP VM on Macbook) <pete.fotheringham@codethink.co.uk>
Wed, 21 Dec 2011 11:20:44 +0000 (11:20 +0000)
committerPete Fotheringham (XP VM on Macbook) <pete.fotheringham@codethink.co.uk>
Wed, 21 Dec 2011 11:20:44 +0000 (11:20 +0000)
commit254e8d1991ccf4d69b9a625d46145e5b274f12ed
tree9d9cacc2b0969b93335cd1f9ea87b272eb1595b0
parentbb5f0fb566d32b717e906c2df4665690158216a3
parent40c2634c3f32b170762ee0cb1e5d272cc4a0f612
Merge branch 'refactoring'

Conflicts:
configure.ac