annotate .svn/pristine/68/68b00a7a7b3e47a6b7ab9ab847a8664cc85e3341.svn-base @ 931:ec1c49528f36 cannam_integration

Merge from branch "redmine-1.3"
author Chris Cannam
date Wed, 27 Jun 2012 15:04:58 +0100
parents cbb26bc654de
children
rev   line source
Chris@909 1 default:
Chris@909 2 somesetting: foo
Chris@909 3
Chris@909 4 production:
Chris@909 5
Chris@909 6 development:
Chris@909 7
Chris@909 8 test: