Merge remote-tracking branch 'upstream/master' into save_rc_stanza
authorFranck Joncourt <franck@debian.org>
Mon, 20 May 2013 09:08:33 +0000 (11:08 +0200)
committerFranck Joncourt <franck@debian.org>
Mon, 20 May 2013 09:08:33 +0000 (11:08 +0200)
commit209b189f202d02134d2523f7479b240ab9863b1a
treeccc5fe8290fded8812b7c8a014cf6f734d0c3b85
parent5e3d9b6e0bdf661fea02f960b8db841afc48d56f
parentfad0ef8690eba98279558b2984cbe72920262804
Merge remote-tracking branch 'upstream/master' into save_rc_stanza