Merge branch 'killis' into killnitc
authorJean Privat <jean@pryen.org>
Wed, 27 Nov 2013 15:24:09 +0000 (10:24 -0500)
committerJean Privat <jean@pryen.org>
Wed, 27 Nov 2013 15:24:09 +0000 (10:24 -0500)
commit9ebbdfda553fe11c6b31256234b51958ac53719b
tree21636bc2bad780dac6e0643301e06dde11118ec5
parent9941ef4ae2b920ad32cc6c8d989d40103900ebe6
parent54b507e9c26f34af6f6716c70527f498e6389906
Merge branch 'killis' into killnitc