Merge remote-tracking branch 'origin/scripts'
authorJiri Slaby <jslaby@suse.cz>
Sun, 12 May 2013 14:53:29 +0000 (16:53 +0200)
committerJiri Slaby <jslaby@suse.cz>
Sun, 12 May 2013 14:53:29 +0000 (16:53 +0200)
commitfa1ab6bd08dfbacdcad6e87354434ecb3fd09228
tree19b9215447c321243176a43768154ecab52d8653
parent7bb3aa92aec3bf8d006bd8cad4ade3d7ab22a702
parent7689b06bd862efb406fc64809e8e482e72e095a0
Merge remote-tracking branch 'origin/scripts'