Merge branch 'master' into topic/trial_design
commitc02f13ffe92b444b10920ea895ee3bd677990588
authorJeremy D. Edwards <jde22@cornell.edu>
Mon, 29 Jul 2013 15:21:03 +0000 (29 11:21 -0400)
committerJeremy D. Edwards <jde22@cornell.edu>
Mon, 29 Jul 2013 15:21:03 +0000 (29 11:21 -0400)
tree7795ccc08588e3e053db7cc2aeb66577569e4afe
parent32b5de662931506d7a7833deb0506c2791b9af0a
parent29206d3660536d0fa3b8633604120dfeb96fcc5a
Merge branch 'master' into topic/trial_design