Merge branch 'master' into 3141-keep-logging-improvements
authorWard Vandewege <ward@curoverse.com>
Wed, 2 Jul 2014 13:51:00 +0000 (09:51 -0400)
committerWard Vandewege <ward@curoverse.com>
Wed, 2 Jul 2014 13:51:00 +0000 (09:51 -0400)
commit3650b57d77642a75fc7f21d339732c2d39431c39
treec088e5f1f073410147257dcd2212a78b112100e3
parent97c9b2b49f94735c6d4d5b62b772089ef7e0e3bf
parentc08bc108cc8471fb8b2b060e681ff7634be2d915
Merge branch 'master' into 3141-keep-logging-improvements