Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-09-02 22:15:55 +01:00
18 changed files with 968 additions and 6177 deletions

View File

@@ -3385,6 +3385,7 @@
<ReferencePath>../../../bin/</ReferencePath>
<Reference name="System"/>
<Reference name="System.Core"/>
<Reference name="System.Xml"/>
<Reference name="System.Data"/>
<Reference name="log4net" path="../../../bin/"/>