Age | Commit message (Collapse) | Author | |
---|---|---|---|
2011-10-31 | Merge commit '1.1.1' into 0.4.x | Robert Newson | |
Conflicts: acinclude.m4.in configure.ac couchjs/c_src/http.c src/erlang-oauth/Makefile.am src/erlang-oauth/oauth.app.in src/erlang-oauth/oauth_hmac_sha1.erl src/erlang-oauth/oauth_http.erl src/erlang-oauth/oauth_plaintext.erl src/etap/etap_web.erl | |||
2011-10-10 | Merge remote-tracking branch 'apache/1.1.x' | Robert Newson | |