Merge branch 'mlutfy-dev-issue-645-1' into development. Fixes #645
authorDarren <darren@darrenwhitlen.com>
Tue, 20 Jan 2015 12:43:01 +0000 (12:43 +0000)
committerDarren <darren@darrenwhitlen.com>
Tue, 20 Jan 2015 12:43:01 +0000 (12:43 +0000)
commit1bf45e5af2698f511e0dc38361bffbec931cf282
tree162487f5106f3fb1452dc2a6dd3eba64f2c38691
parent169112660e33665bb47f64d16eeb4a09ebd0240e
parent4624f8b56e56b3a44109b7722c72a4528487a5ab
Merge branch 'mlutfy-dev-issue-645-1' into development. Fixes #645