gllmflndn/ni-dm — pull request #1 by jbpoline (2013-11-22 01:01:00+00:00)
Title: fixing merge conflicts : getting the commits from ni-/ni-dm from which you were behind 

before sending pull request - may be try to pull from ni-/ni-dm