Fix typo
Merge remote-tracking branch 'origin/master' into 2014
Allow math directive to have math on same line
Alias code-block directive to code
Merge branch 'master' into 2014
Update conference particulars
Fix typo in configuration
Merge branch 'master' into 2014
Merge branch 'master' into 2014
merge