Merge branch 'master' into stable: Added Website field to exhibitor form.
authorrsiddharth <rsd@gnu.org>
Mon, 29 Sep 2014 22:56:02 +0000 (18:56 -0400)
committerrsiddharth <rsd@gnu.org>
Mon, 29 Sep 2014 22:56:02 +0000 (18:56 -0400)
1  2 
2015/exhibit/index.html

Simple merge