Merge branch 'master' into nag_4_2

horde · Nov 17, 2013 · 270e64b · 270e64b
2 parents 01cfdd1 + 7d433df
commit 270e64b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php b/framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php
@@ -645,7 +645,7 @@ public function setDeviceInfo(Horde_ActiveSync_Device $data, array $dirty = arra
      */
     public function setDeviceProperties(array $data, $deviceId)
     {
-        $query = 'UPDATE ' . $this->_syncDeviceTable . ' SET device_properties = ?,'
+        $query = 'UPDATE ' . $this->_syncDeviceTable . ' SET device_properties = ?'
             . ' WHERE device_id = ?';
         $properties = array(
             serialize($data),