Merge branch 'master' into careminster

This commit is contained in:
Melanie
2013-02-22 01:28:54 +00:00
141 changed files with 12110 additions and 779 deletions

View File

@@ -62,4 +62,4 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below:
[assembly : AssemblyVersion("0.7.6.*")]
[assembly : AssemblyFileVersion("0.6.5.0")]