Merge: nitiwiki: fix multiple trails
authorJean Privat <jean@pryen.org>
Sat, 28 Nov 2015 23:04:07 +0000 (18:04 -0500)
committerJean Privat <jean@pryen.org>
Sat, 28 Nov 2015 23:04:07 +0000 (18:04 -0500)
commit2dd9612e200f9cb170cf895976125704b6c9c441
tree3cc0f3972bfb23f4be94b9520c03e16572659bb5
parent9519a29d66ed1f791f991e8df621f03ce8897686
parentf574c453106218667d762d628e77ef82dc5fe720
Merge: nitiwiki: fix multiple trails

Fix a bug where independent trails could have been merged into a big one.

Pull-Request: #1854
Reviewed-by: Alexandre Terrasa <alexandre@moz-code.org>