Merge with master

This commit is contained in:
Viktor Klang 2013-03-29 01:50:43 +01:00
commit f7e0cdad9f

View file

@ -15,7 +15,6 @@ import scala.concurrent.duration.FiniteDuration
import scala.annotation.tailrec
import scala.util.control.NonFatal
import com.typesafe.config.Config
/**
* INTERNAL API
*/