Merge branch 'master' into anyevent
authorDirk Koopman <djk@tobit.co.uk>
Mon, 12 Mar 2012 23:44:36 +0000 (23:44 +0000)
committerDirk Koopman <djk@tobit.co.uk>
Mon, 12 Mar 2012 23:44:36 +0000 (23:44 +0000)
commit0e896695f3297c3989a5159af0a36f28d8164c15
tree53f6d399a78f234e03eb8d182ef010c38a0e69f3
parent4e42369e6f34642784560dc41e54bf5cb029757f
parent427bd0165d0b8bec0e93cc2b262fcbe0d3cb5855
Merge branch 'master' into anyevent

Conflicts:
perl/DXUser.pm
perl/Version.pm

Add database handling changes from master
perl/Version.pm