commit | 55515c96078dfa64d2a90398dd26764e8d6ea8da | [log] [tgz] |
---|---|---|
author | Edwin Kempin <edwin.kempin@sap.com> | Wed Dec 12 23:45:51 2012 -0800 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Dec 12 23:45:51 2012 -0800 |
tree | 89805e16c02666523e71424754613d620ce6ec65 | |
parent | 5fb7d8a58059571c35ab3c969a0c4e1e3cc27eee [diff] | |
parent | 9d726c880383b41796d4802028badbc8b3c1f43d [diff] |
Merge "Merge branch 'stable-2.5'"