]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorRobin Appelman <icewind1991@gmail.com>
Tue, 6 Jul 2010 08:35:23 +0000 (10:35 +0200)
committerRobin Appelman <icewind1991@gmail.com>
Tue, 6 Jul 2010 08:35:23 +0000 (10:35 +0200)
commit1bdfe395cd5beabc4ec9e3bd55d944d933d7b053
treed631a462174e85fa3bc6c7669d52b6baa5ef2ff7
parentc718716e571b66178e6397b7eb3ec169cc9a5a20
parent11d515ef4ec2ad1211b6873c04ce8acb6ca3bcaa
Merge branch 'master' of gitorious.org:owncloud/owncloud

Conflicts:
inc/lib_log.php
inc/lib_log.php
inc/lib_user.php