| commit | 2d7667f8d83ee059c2f792040bed255f716c634c | [log] [tgz] |
|---|---|---|
| author | Serge Hallyn <serge.hallyn@ubuntu.com> | Tue Jun 03 15:48:34 2014 -0500 |
| committer | Serge Hallyn <serge.hallyn@ubuntu.com> | Tue Jun 03 15:48:34 2014 -0500 |
| tree | d1203cbc533663a05ff192b952835d424abc75e7 | |
| parent | c9482a5bdcc09be9096f40e858c5fe39c389cd52 [diff] | |
| parent | f9b2a735bdddf836214b5dca74f6ca7712e5a08c [diff] |
Merge branch 'james-next-mimi-paul' into serge-next