release/2013-10-05.17
default avatar
brianp@instructure.com
0eda40f6 · fix bad merge conflict resolution in canvas.rb · 
canvas release release/2013-10-05.17