Merge commit '915c784e9f165c8aaf3007c79141f3f7724eff86'

mccraigmccraig · Jun 15, 2012 · 9062ac0 · 9062ac0
2 parents 1b3f554 + 915c784
commit 9062ac0
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/attributes/default.rb~ b/attributes/default.rb~