Automatically built: commit bea3c097effd1be60de4f42118c1d51fc6250d1c
Merge: ddd2432 d9d9b6b
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Wed Aug 13 16:19:44 2014 -0700

    Merge pull request #813 from code-dot-org/beeBlocks

    [Finishes #76912006] bee conditional blocks should have text field

commit d9d9b6b7d6ccf5a951df3190f046efdf9f685523
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Wed Aug 13 16:05:01 2014 -0700

    [Finishes #76912006] bee conditional blocks should have text field
Automatically built: commit bea3c097effd1be60de4f42118c1d51fc6250d1c
Merge: ddd2432 d9d9b6b
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Wed Aug 13 16:19:44 2014 -0700

    Merge pull request #813 from code-dot-org/beeBlocks

    [Finishes #76912006] bee conditional blocks should have text field

commit d9d9b6b7d6ccf5a951df3190f046efdf9f685523
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Wed Aug 13 16:05:01 2014 -0700

    [Finishes #76912006] bee conditional blocks should have text field
Merge branch 'finished' into staging