Merge.

diff --cc src/lib/subtitle_content.cc
index 7792f3ef6fafd7a8b9ed84963828e964558dbad9,df90a4a1a2630056693bad3623de40935088c8ea..f10fa58b2d2588fc69fb8dd75287f9bc1d7f6202
--- 1/src/lib/subtitle_content.cc
--- 2/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@@ -139,9 -139,7 +139,13 @@@ SubtitleContent::as_xml (xmlpp::Node* r
        root->add_child("SubtitleYOffset")->add_child_text (raw_convert<string> (_subtitle_y_offset));
        root->add_child("SubtitleXScale")->add_child_text (raw_convert<string> (_subtitle_x_scale));
        root->add_child("SubtitleYScale")->add_child_text (raw_convert<string> (_subtitle_y_scale));
++<<<<<<< HEAD
 +      if (_subtitle_language) {
 +              root->add_child("SubtitleLanguage")->add_child_text (_subtitle_language.get ());
 +      }
++=======
+       root->add_child("SubtitleLanguage")->add_child_text (_subtitle_language);
++>>>>>>> 30a2bb95980d74a33baeb18d18f2e4ac72d66845
  }
  
  void

diff --cc src/lib/subtitle_content.h
Simple merge