Merge remote-tracking branch 'origin/master' into drizzle
commit021972892941ac9279e6272addce774779a09374
authorPiotr Przybylski <piotrprz@gmail.com>
Fri, 5 Aug 2011 20:48:03 +0000 (5 22:48 +0200)
committerPiotr Przybylski <piotrprz@gmail.com>
Fri, 5 Aug 2011 20:48:03 +0000 (5 22:48 +0200)
tree8418772eae24baa4e157c2704b16f23b04be911f
parent381e172fcc5913528b058e6af5d95c594bfa51e1
parenteb66564960eeb840a7521a35c00d32aebb9525bb
Merge remote-tracking branch 'origin/master' into drizzle
libraries/server_synchronize.lib.php
server_synchronize.php