josch 7dcf15a5f5 resolve conflict		2014-06-26 14:09:55 +02:00
..
create_user	initial commit	2011-06-22 09:50:36 +02:00
empty_password	initial commit	2011-06-22 09:50:36 +02:00
firstboot	resolve conflict	2014-06-26 14:09:55 +02:00
serial_tty	initial commit	2011-06-22 09:50:36 +02:00