Merge: Embarassing fixes
authorJean Privat <jean@pryen.org>
Tue, 23 Sep 2014 22:21:31 +0000 (18:21 -0400)
committerJean Privat <jean@pryen.org>
Tue, 23 Sep 2014 22:21:31 +0000 (18:21 -0400)
commitc128e164dcb14f779353e1e1005ce8128ed52709
treea029ed127227ada4ccda1f6776561d20e3c40fbd
parent9cfab85cc07e5449f3496f92d493408691d38cb5
parent19a4058ce102edf80ecfe97f756d3383e37cd7ef
Merge: Embarassing fixes

Don't ask me why it worked before...

Pull-Request: #767
Reviewed-by: Jean Privat <jean@pryen.org>
Reviewed-by: Alexandre Terrasa <alexandre@moz-code.org>