Merge branch 'master' into 2107-radhika-user-guide-minor-updates
authorradhika chippada <radhika@radhika.curoverse>
Tue, 4 Mar 2014 20:31:31 +0000 (15:31 -0500)
committerradhika chippada <radhika@radhika.curoverse>
Tue, 4 Mar 2014 20:31:31 +0000 (15:31 -0500)
commitcad44d1dbfdd2cbadba521a88c0817b144dd1d6b
tree80621c47416b7fbe3c14661e0296679d68168900
parent63511ce5f1dc6d6e38cfafe240f0c907ad11748e
parent7722719387453c7ab5f9326536daa2655cad60c9
Merge branch 'master' into 2107-radhika-user-guide-minor-updates

Conflicts:
doc/_config.yml
doc/_config.yml