&zzz
+FreefallHeavens
+R4SAS
+RN_
+Romster
+Stormycloud
+T3s|4
+acetone
+cims
+eche|off
+mareki2p
+nilbog
+nyaa2pguy
+orignal
+postman
+qend-irc2p
+wodencafe
Arch
Danny
Irc2PGuest15434
Irc2PGuest16019
Irc2PGuest20377
Irc2PGuest33925
Irc2PGuest35412
Irc2PGuest77921
MatrixBot
NiceBoat
Onn4l7h
Onn4|7h
Over
Sisyphus
T3s|4_
Teeed
aargh4
ahiru
ananas
anontor2
b3t4f4c3___
dr4wd3_
duanin2
ice_juice
mahlay
makoto
marek
n2_
noidea
not_bob_afk2
o3d3
p2pworm
poriori
profetikla
r00tobo
rapidash
rednode
sahil
solidx66
stormycloud[m]
sublimia
test3847473
uop23ip
urist_
vivid_reader56
x74a6
zelgomer
zzz
eyedeekay, I'm in trouble here, there's a lot more to do than I thought
zzz
I need to rebase so I can see what I'm doing
zzz
what branch should I rebase into or should I create yet another one?
eyedeekay
Creating another one is probably easiest to keep track of
zzz
ok, will do, thanks
zzz
ok still had that build.xml conflict but fixed it. pushed jetty12-rb which is the same as jetty12-2 but rebased to master
zzz
where are we with the SAM PR? you were going to do a command line merge?
eyedeekay
Yes I am going to do a local merge and push it onto master myself
eyedeekay
Can do that for all of them unless you would rather do it for jetty12
zzz
just do the SAM one for now, nothing else is ready, we can decide when we get there
eyedeekay
Ok