fixed merge conflicts
authorAndrew Tridgell <tridge@samba.org>
Sat, 18 Apr 2009 21:46:32 +0000 (07:46 +1000)
committerAndrew Tridgell <tridge@samba.org>
Sat, 18 Apr 2009 21:46:32 +0000 (07:46 +1000)
commit21761927829b1285aad4ca0c344fcb0ddaa4ff0f
tree4c8e5b5ab1f9beff3f259a1a5e942b670453b060
parent84ade32deb605002bf30d0cb88c279fb2a58e2ab
parente1fa25eea50f1616736da9db6478c7b4555e7cad
fixed merge conflicts
lectures.php