Merge branch 'master' of git://repo.or.cz/rox-lib
commit6ecb966c1c6e253e1d6bb98060b60358432d03ea
authorStephen Watson <stephen@kerofin.demon.co.uk>
Sat, 20 Jun 2009 16:41:07 +0000 (20 17:41 +0100)
committerStephen Watson <stephen@kerofin.demon.co.uk>
Sat, 20 Jun 2009 16:41:07 +0000 (20 17:41 +0100)
tree7ae8534f6f338766058409aa3bc1ac24dcc68cd0
parentb933633bc6f75861fd45b41140b0d6ccd143145c
parent8c7241812ef60c9379d200f21524b1b2f474beea
Merge branch 'master' of git://repo.or.cz/rox-lib