diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-05-06 15:03:49 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-05-06 15:03:49 -0300 |
| commit | 10c7127d5ff693a8f0c9671b9d3253315f2095be (patch) | |
| tree | 07cc635750c86f96e3544f47deebdfd9bb50dcb7 /bootlog | |
| parent | 9e13f3aecd7c8c716929be9d9faf8725e3065a0e (diff) | |
| parent | 86b2cb99028d81a6cb608f09e1a31bc7744a991c (diff) | |
Merge branch 'master' of git://projects.archlinux.org/initscripts2012.05.2
Conflicts:
Makefile
Diffstat (limited to 'bootlog')
0 files changed, 0 insertions, 0 deletions