projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9724afd
adcdc96
)
Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_b...
author
masensio
<masensio@solidgear.es>
Wed, 21 Aug 2013 16:24:52 +0000
(18:24 +0200)
committer
masensio
<masensio@solidgear.es>
Wed, 21 Aug 2013 16:24:52 +0000
(18:24 +0200)
Trivial merge