]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into appframework-master
authorThomas Müller <thomas.mueller@tmit.eu>
Fri, 27 Sep 2013 12:25:47 +0000 (14:25 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Fri, 27 Sep 2013 12:25:47 +0000 (14:25 +0200)
commit687ba053b7055900dc938da5b82b6d391b0b4318
tree34e893923186c3373e85fb84e621b93f49dbf562
parent469b309b21b6634b275c485fb09aa5d8d69fe33c
parent735608f51323218a098137a4992aeafff5806f5c
Merge branch 'master' into appframework-master
lib/user.php
lib/user/session.php