shortanswer qtype: MDL-17800 Fix merge problem. Thanks to Oleg for spotting this.

question/type/shortanswer/questiontype.php

@@ -262,6 +262,8 @@ class question_shortanswer_qtype extends default_questiontype {
                 $status = $status && $DB->update_record($questionextensiontable, $questionextradata);
             }
         }
+
+        return $status;
     }
 
    /**