Merge remote-tracking branch 'amitay/master'
authorMartin Schwenke <martin@meltin.net>
Wed, 28 Mar 2012 05:02:36 +0000 (16:02 +1100)
committerMartin Schwenke <martin@meltin.net>
Wed, 28 Mar 2012 05:02:36 +0000 (16:02 +1100)
1  2 
autocluster
config.d/00base.defconf

diff --cc autocluster
Simple merge
Simple merge