Merge pull request #12 from dmeltzer/master
authorManuel Nickschas <sputnick@quassel-irc.org>
Thu, 7 Mar 2013 22:51:29 +0000 (14:51 -0800)
committerManuel Nickschas <sputnick@quassel-irc.org>
Thu, 7 Mar 2013 22:51:29 +0000 (14:51 -0800)
commita41481e9260de128d7f68e525c855d4a75dbe6fd
tree9fa8ccab3a2f58053ae30cb8e9e21d01e9389bd9
parent89ae7093aaf405d24f3d7ac0825290f2a065da99
parent33f69bd2139607510b17991425e92ce79ba56b16
Merge pull request #12 from dmeltzer/master

Fix build on os x 10.7