Lokaltog/powerline — pull request #448 by ZyX-I (2013-04-20 20:41:16+00:00)
Title: Added missing pl argument

It is a problem with git automatic merging. For some reason git used to think there is no conflict here.