Merge branch '1904-object-scopes'
authorBrett Smith <brett@curoverse.com>
Mon, 28 Apr 2014 18:07:02 +0000 (14:07 -0400)
committerBrett Smith <brett@curoverse.com>
Mon, 28 Apr 2014 18:07:30 +0000 (14:07 -0400)
commit03e570095885982d23e234bce8e1c068314b63af
tree818c39e319a278eb9a9f2beb0277160ffddc7d95
parent71b1b7b045419817d1c9dc62a3a296b746d9117c
parent5c2758ca38d01a905253f86e63be3a5fe03a3871
Merge branch '1904-object-scopes'

Closes #2642, #2662, #2682.